Commit 2357f2b2 authored by Jouni Högander's avatar Jouni Högander Committed by Matt Roper
Browse files

drm/i915/mtl: Initial display workarounds 



This patch introduces initial workarounds for mtl platform

v2: switch IS_MTL_DISPLAY_STEP to use IS_METEORLAKE from testing display
ver. (Tvrtko)

v3: clerical issues, extend 16015201720 to mtl. (MattR)

v4: make sure 16015201720 includes display 13. (MattR)

Bspec: 66624

Signed-off-by: default avatarMatt Atwood <matthew.s.atwood@intel.com>
Signed-off-by: default avatarJouni Högander <jouni.hogander@intel.com>
Reviewed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Signed-off-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221209220543.502047-1-matthew.s.atwood@intel.com
parent 4c0eb35f

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

+2 −2
Original line number Diff line number Diff line
@@ -387,11 +387,11 @@ static void pipedmc_clock_gating_wa(struct drm_i915_private *i915, bool enable) 
{

	enum pipe pipe;



	if (DISPLAY_VER(i915) != 13)

	if (DISPLAY_VER(i915) < 13)

		return;



	/*

	 * Wa_16015201720:adl-p,dg2

	 * Wa_16015201720:adl-p,dg2, mtl

	 * The WA requires clock gating to be disabled all the time

	 * for pipe A and B.

	 * For pipe C and D clock gating needs to be disabled only

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

+4 −2
Original line number Diff line number Diff line
@@ -811,7 +811,7 @@ static void intel_fbc_program_cfb(struct intel_fbc *fbc) 


static void intel_fbc_program_workarounds(struct intel_fbc *fbc)

{

	/* Wa_22014263786:icl,jsl,tgl,dg1,rkl,adls,adlp */

	/* Wa_22014263786:icl,jsl,tgl,dg1,rkl,adls,adlp,mtl */

	if (DISPLAY_VER(fbc->i915) >= 11 && !IS_DG2(fbc->i915))

		intel_de_rmw(fbc->i915, ILK_DPFC_CHICKEN(fbc->id), 0,

			     DPFC_CHICKEN_FORCE_SLB_INVALIDATION);
@@ -1091,7 +1091,9 @@ static int intel_fbc_check_plane(struct intel_atomic_state *state, 
	}



	/* Wa_14016291713 */

	if (IS_DISPLAY_VER(i915, 12, 13) && crtc_state->has_psr) {

	if ((IS_DISPLAY_VER(i915, 12, 13) ||

	     IS_MTL_DISPLAY_STEP(i915, STEP_A0, STEP_C0)) &&

	    crtc_state->has_psr) {

		plane_state->no_fbc_reason = "PSR1 enabled (Wa_14016291713)";

		return 0;

	}

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

+2 −1
Original line number Diff line number Diff line
@@ -537,7 +537,8 @@ void hsw_write_infoframe(struct intel_encoder *encoder, 
			       0);



	/* Wa_14013475917 */

	if (DISPLAY_VER(dev_priv) == 13 && crtc_state->has_psr &&

	if ((DISPLAY_VER(dev_priv) == 13 ||

	     IS_MTL_DISPLAY_STEP(dev_priv, STEP_A0, STEP_B0)) && crtc_state->has_psr &&

	    type == DP_SDP_VSC)

		return;

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

+19 −8
Original line number Diff line number Diff line
@@ -797,7 +797,7 @@ static bool psr2_granularity_check(struct intel_dp *intel_dp, 
		return intel_dp->psr.su_y_granularity == 4;



	/*

	 * adl_p and display 14+ platforms has 1 line granularity.

	 * adl_p and mtl platforms have 1 line granularity.

	 * For other platforms with SW tracking we can adjust the y coordinates

	 * to match sink requirement if multiple of 4.

	 */
@@ -1170,11 +1170,14 @@ static void intel_psr_enable_source(struct intel_dp *intel_dp, 
				     PSR2_ADD_VERTICAL_LINE_COUNT);



		/*

		 * Wa_16014451276:adlp

		 * Wa_16014451276:adlp,mtl[a0,b0]

		 * All supported adlp panels have 1-based X granularity, this may

		 * cause issues if non-supported panels are used.

		 */

		if (IS_ALDERLAKE_P(dev_priv))

		if (IS_MTL_DISPLAY_STEP(dev_priv, STEP_A0, STEP_B0))

			intel_de_rmw(dev_priv, MTL_CHICKEN_TRANS(cpu_transcoder), 0,

				     ADLP_1_BASED_X_GRANULARITY);

		else if (IS_ALDERLAKE_P(dev_priv))

			intel_de_rmw(dev_priv, CHICKEN_TRANS(cpu_transcoder), 0,

				     ADLP_1_BASED_X_GRANULARITY);
@@ -1185,8 +1188,12 @@ static void intel_psr_enable_source(struct intel_dp *intel_dp, 
				     TRANS_SET_CONTEXT_LATENCY_MASK,

				     TRANS_SET_CONTEXT_LATENCY_VALUE(1));



		/* Wa_16012604467:adlp */

		if (IS_ALDERLAKE_P(dev_priv))

		/* Wa_16012604467:adlp,mtl[a0,b0] */

		if (IS_MTL_DISPLAY_STEP(dev_priv, STEP_A0, STEP_B0))

			intel_de_rmw(dev_priv,

				     MTL_CLKGATE_DIS_TRANS(cpu_transcoder), 0,

				     MTL_CLKGATE_DIS_TRANS_DMASC_GATING_DIS);

		else if (IS_ALDERLAKE_P(dev_priv))

			intel_de_rmw(dev_priv, CLKGATE_DIS_MISC, 0,

				     CLKGATE_DIS_MISC_DMASC_GATING_DIS);
@@ -1362,8 +1369,12 @@ static void intel_psr_disable_locked(struct intel_dp *intel_dp) 
				     TRANS_SET_CONTEXT_LATENCY(intel_dp->psr.transcoder),

				     TRANS_SET_CONTEXT_LATENCY_MASK, 0);



		/* Wa_16012604467:adlp */

		if (IS_ALDERLAKE_P(dev_priv))

		/* Wa_16012604467:adlp,mtl[a0,b0] */

		if (IS_MTL_DISPLAY_STEP(dev_priv, STEP_A0, STEP_B0))

			intel_de_rmw(dev_priv,

				     MTL_CLKGATE_DIS_TRANS(intel_dp->psr.transcoder),

				     MTL_CLKGATE_DIS_TRANS_DMASC_GATING_DIS, 0);

		else if (IS_ALDERLAKE_P(dev_priv))

			intel_de_rmw(dev_priv, CLKGATE_DIS_MISC,

				     CLKGATE_DIS_MISC_DMASC_GATING_DIS, 0);
@@ -1625,7 +1636,7 @@ static void psr2_man_trk_ctl_calc(struct intel_crtc_state *crtc_state, 


	if (full_update) {

		/*

		 * Not applying Wa_14014971508:adlp as we do not support the

		 * Not applying Wa_14014971508:adlp,mtl as we do not support the

		 * feature that requires this workaround.

		 */

		val |= man_trk_ctl_single_full_frame_bit_get(dev_priv);

drivers/gpu/drm/i915/i915_drv.h

+4 −0
Original line number Diff line number Diff line
@@ -726,6 +726,10 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, 
#define IS_XEHPSDV_GRAPHICS_STEP(__i915, since, until) \

	(IS_XEHPSDV(__i915) && IS_GRAPHICS_STEP(__i915, since, until))



#define IS_MTL_DISPLAY_STEP(__i915, since, until) \

	(IS_METEORLAKE(__i915) && \

	 IS_DISPLAY_STEP(__i915, since, until))



/*

 * DG2 hardware steppings are a bit unusual.  The hardware design was forked to

 * create three variants (G10, G11, and G12) which each have distinct