On Tue, 03 May 2022, Ville Syrjala <ville.syrjala@xxxxxxxxxxxxxxx> wrote: > From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > > Don't see a real reson not to check hw.active and hw.enable in > intel_pipe_config_compare(). We do have some checks for them > at a higher level, but I think better check them also in > intel_pipe_config_compare() in case something else doesn't > do a thorough enough job. > > Also shuffle the mst_master_transcoder check next to the > cpu_transcoder check for a bit of consistency. > > Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> Reviewed-by: Jani Nikula <jani.nikula@xxxxxxxxx> > --- > drivers/gpu/drm/i915/display/intel_display.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c > index a81d866bdb19..2acc5f3a2c0e 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -6160,7 +6160,11 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, > #define PIPE_CONF_QUIRK(quirk) \ > ((current_config->quirks | pipe_config->quirks) & (quirk)) > > + PIPE_CONF_CHECK_I(hw.enable); > + PIPE_CONF_CHECK_I(hw.active); > + > PIPE_CONF_CHECK_I(cpu_transcoder); > + PIPE_CONF_CHECK_I(mst_master_transcoder); > > PIPE_CONF_CHECK_BOOL(has_pch_encoder); > PIPE_CONF_CHECK_I(fdi_lanes); > @@ -6333,8 +6337,6 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, > PIPE_CONF_CHECK_I(splitter.link_count); > PIPE_CONF_CHECK_I(splitter.pixel_overlap); > > - PIPE_CONF_CHECK_I(mst_master_transcoder); > - > PIPE_CONF_CHECK_BOOL(vrr.enable); > PIPE_CONF_CHECK_I(vrr.vmin); > PIPE_CONF_CHECK_I(vrr.vmax); -- Jani Nikula, Intel Open Source Graphics Center
