From: Rodrigo Siqueira <[email protected]> Fix for 'drm/i915/writeback: Modify state verify function'.
That patch disables a bunch of checks for writeback connectors as they are not relevant. One is the pixel rate. However, rather than just putting an 'if(!writeback)' around the existing check, a new check was added with the if. Or more likely, a rebase somewhere re-instated the original check without the if. Either way, the original check was still present and still firing. Signed-off-by: Rodrigo Siqueira <[email protected]> --- drivers/gpu/drm/i915/display/intel_display.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index 787566c8a743..35ca757c76e6 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -5445,12 +5445,11 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, PIPE_CONF_CHECK_RECT(pch_pfit.dst); PIPE_CONF_CHECK_I(scaler_state.scaler_id); - PIPE_CONF_CHECK_I(pixel_rate); + if (!is_writeback) + PIPE_CONF_CHECK_I(pixel_rate); PIPE_CONF_CHECK_BOOL(hw.casf_params.casf_enable); PIPE_CONF_CHECK_I(hw.casf_params.win_size); PIPE_CONF_CHECK_I(hw.casf_params.strength); - if (!is_writeback) - PIPE_CONF_CHECK_I(pixel_rate); PIPE_CONF_CHECK_X(gamma_mode); if (display->platform.cherryview) -- 2.43.0
