Commit f2206df8 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Check hw.enable and hw.active in intel_pipe_config_compare() 



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: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220503182242.18797-21-ville.syrjala@linux.intel.com


Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 58ae532e

drivers/gpu/drm/i915/display/intel_display.c

+4 −2
Original line number Diff line number Diff line
@@ -6203,7 +6203,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);
@@ -6376,8 +6380,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);