Commit efa894a5 authored by Matt Roper's avatar Matt Roper
Browse files

drm/i915/rkl: Wa_1408330847 no longer applies to RKL 



RKL doesn't have PSR2 support, so PSR2-related workarounds no longer
apply.

Bspec: 53273
Signed-off-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Reviewed-by: default avatarJosé Roberto de Souza <jose.souza@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210717051426.4120328-7-matthew.d.roper@intel.com
parent e04a71e6

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

+4 −6
Original line number Diff line number Diff line
@@ -594,9 +594,8 @@ static void hsw_activate_psr2(struct intel_dp *intel_dp) 
		val |= EDP_PSR2_SU_SDP_SCANLINE;



	if (intel_dp->psr.psr2_sel_fetch_enabled) {

		/* WA 1408330847 */

		if (IS_TGL_DISPLAY_STEP(dev_priv, STEP_A0, STEP_A0) ||

		    IS_RKL_DISPLAY_STEP(dev_priv, STEP_A0, STEP_A0))

		/* Wa_1408330847 */

		if (IS_TGL_DISPLAY_STEP(dev_priv, STEP_A0, STEP_A0))

			intel_de_rmw(dev_priv, CHICKEN_PAR1_1,

				     DIS_RAM_BYPASS_PSR2_MAN_TRACK,

				     DIS_RAM_BYPASS_PSR2_MAN_TRACK);
@@ -1345,10 +1344,9 @@ static void intel_psr_disable_locked(struct intel_dp *intel_dp) 
	intel_psr_exit(intel_dp);

	intel_psr_wait_exit_locked(intel_dp);



	/* WA 1408330847 */

	/* Wa_1408330847 */

	if (intel_dp->psr.psr2_sel_fetch_enabled &&

	    (IS_TGL_DISPLAY_STEP(dev_priv, STEP_A0, STEP_A0) ||

	     IS_RKL_DISPLAY_STEP(dev_priv, STEP_A0, STEP_A0)))

	    IS_TGL_DISPLAY_STEP(dev_priv, STEP_A0, STEP_A0))

		intel_de_rmw(dev_priv, CHICKEN_PAR1_1,

			     DIS_RAM_BYPASS_PSR2_MAN_TRACK, 0);