Commit 9b2e49a1 authored by José Roberto de Souza's avatar José Roberto de Souza
Browse files

drm/i915/display: Fix fastsets involving PSR 



Commit 78b772e1 ("drm/i915/display: Fill PSR state during hardware
configuration read out") is not allowing fastsets to happen when PSR
states changes but PSR is a feature that can be enabled and disabled
during fastsets.

So here moving the PSR pipe conf checks to a block that is only
executed when checking if HW state matches with requested state, not
during the phase where it checks if fastset is possible or not.

There still a state mismatch not allowing fastsets between states
turning off or on PSR because of crtc_state->infoframes.enable
BIT(DP_SDP_VSC) but at least for now it will allow a fastset between
PSR1 <-> PSR2, that is a case heavilly used by CI due to pipe CRC not
work with PSR2, but the remaning issue will be fixed in a future patch.

Cc: Gwan-gyeong Mun <gwan-gyeong.mun@intel.com>
Cc: Radhakrishna Sripada <radhakrishna.sripada@intel.com>
Reported-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Fixes: 78b772e1 ("drm/i915/display: Fill PSR state during hardware configuration read out")
Signed-off-by: default avatarJosé Roberto de Souza <jose.souza@intel.com>
Reviewed-by: default avatarGwan-gyeong Mun <gwan-gyeong.mun@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210514232247.144542-1-jose.souza@intel.com
parent abb9fe43

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

+5 −5
Original line number Diff line number Diff line
@@ -8603,6 +8603,11 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, 
		bp_gamma = intel_color_get_gamma_bit_precision(pipe_config);

		if (bp_gamma)

			PIPE_CONF_CHECK_COLOR_LUT(gamma_mode, hw.gamma_lut, bp_gamma);



		PIPE_CONF_CHECK_BOOL(has_psr);

		PIPE_CONF_CHECK_BOOL(has_psr2);

		PIPE_CONF_CHECK_BOOL(enable_psr2_sel_fetch);

		PIPE_CONF_CHECK_I(dc3co_exitline);

	}



	PIPE_CONF_CHECK_BOOL(double_wide);
@@ -8687,11 +8692,6 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, 
	PIPE_CONF_CHECK_I(vrr.pipeline_full);

	PIPE_CONF_CHECK_I(vrr.guardband);



	PIPE_CONF_CHECK_BOOL(has_psr);

	PIPE_CONF_CHECK_BOOL(has_psr2);

	PIPE_CONF_CHECK_BOOL(enable_psr2_sel_fetch);

	PIPE_CONF_CHECK_I(dc3co_exitline);



#undef PIPE_CONF_CHECK_X

#undef PIPE_CONF_CHECK_I

#undef PIPE_CONF_CHECK_BOOL