Commit 909a0bcd authored by Matt Roper's avatar Matt Roper
Browse files

drm/xe: Consolidate workaround entries for Wa_16021639441 



Wa_16021639441 applies to all graphics versions from 20.01 through 20.04
(inclusive) and all media versions from 13.01 to 20.00 (inclusive).
Consolidate the RTP entries into a single range-based entry.
Also drop the reference to Wa_18032095049 which was only relevant to
pre-production platforms that we no longer support.

Reviewed-by: default avatarBalasubramani Vivekanandan <balasubramani.vivekanandan@intel.com>
Link: https://patch.msgid.link/20260220-forupstream-wa_cleanup-v2-12-b12005a05af6@intel.com


Signed-off-by: default avatarMatt Roper <matthew.d.roper@intel.com>
parent 792880ca

drivers/gpu/drm/xe/xe_wa.c

+13 −46
Original line number Diff line number Diff line
@@ -363,6 +363,19 @@ static const struct xe_rtp_entry_sr engine_was[] = { 
		       FUNC(xe_rtp_match_first_render_or_compute)),

	  XE_RTP_ACTIONS(SET(LSC_CHICKEN_BIT_0_UDW, ENABLE_SMP_LD_RENDER_SURFACE_CONTROL))

	},

	/*

	 * Although this workaround isn't required for the RCS, disabling these

	 * reports has no impact for our driver or the GuC, so we go ahead and

	 * apply this to all engines for simplicity.

	 */

	{ XE_RTP_NAME("16021639441"),

	  XE_RTP_RULES(GRAPHICS_VERSION_RANGE(2001, 2004), OR,

		       MEDIA_VERSION_RANGE(1301, 2000)),

	  XE_RTP_ACTIONS(SET(CSFE_CHICKEN1(0),

			     GHWSP_CSB_REPORT_DIS |

			     PPHWSP_CSB_AND_TIMESTAMP_REPORT_DIS,

			     XE_RTP_ACTION_FLAG(ENGINE_BASE)))

	},



	/* TGL */
@@ -505,20 +518,6 @@ static const struct xe_rtp_entry_sr engine_was[] = { 
		       FUNC(xe_rtp_match_first_render_or_compute)),

	  XE_RTP_ACTIONS(SET(ROW_CHICKEN4, DISABLE_TDL_PUSH))

	},

	/*

	 * These two workarounds are the same, just applying to different

	 * engines.  Although Wa_18032095049 (for the RCS) isn't required on

	 * all steppings, disabling these reports has no impact for our

	 * driver or the GuC, so we go ahead and treat it the same as

	 * Wa_16021639441 which does apply to all steppings.

	 */

	{ XE_RTP_NAME("18032095049, 16021639441"),

	  XE_RTP_RULES(GRAPHICS_VERSION(2004)),

	  XE_RTP_ACTIONS(SET(CSFE_CHICKEN1(0),

			     GHWSP_CSB_REPORT_DIS |

			     PPHWSP_CSB_AND_TIMESTAMP_REPORT_DIS,

			     XE_RTP_ACTION_FLAG(ENGINE_BASE)))

	},

	{ XE_RTP_NAME("16018610683"),

	  XE_RTP_RULES(GRAPHICS_VERSION(2004), FUNC(xe_rtp_match_first_render_or_compute)),

	  XE_RTP_ACTIONS(SET(TDL_TSL_CHICKEN, SLM_WMTP_RESTORE))
@@ -546,18 +545,6 @@ static const struct xe_rtp_entry_sr engine_was[] = { 
		       FUNC(xe_rtp_match_first_render_or_compute)),

	  XE_RTP_ACTIONS(SET(ROW_CHICKEN, EARLY_EOT_DIS))

	},

	/*

	 * Although this workaround isn't required for the RCS, disabling these

	 * reports has no impact for our driver or the GuC, so we go ahead and

	 * apply this to all engines for simplicity.

	 */

	{ XE_RTP_NAME("16021639441"),

	  XE_RTP_RULES(GRAPHICS_VERSION_RANGE(2001, 2002)),

	  XE_RTP_ACTIONS(SET(CSFE_CHICKEN1(0),

			     GHWSP_CSB_REPORT_DIS |

			     PPHWSP_CSB_AND_TIMESTAMP_REPORT_DIS,

			     XE_RTP_ACTION_FLAG(ENGINE_BASE)))

	},

	{ XE_RTP_NAME("14019811474"),

	  XE_RTP_RULES(GRAPHICS_VERSION(2001),

		       FUNC(xe_rtp_match_first_render_or_compute)),
@@ -584,26 +571,6 @@ static const struct xe_rtp_entry_sr engine_was[] = { 
	  XE_RTP_ACTIONS(SET(TDL_CHICKEN, EUSTALL_PERF_SAMPLING_DISABLE))

	},



	/* Xe2_LPM */



	{ XE_RTP_NAME("16021639441"),

	  XE_RTP_RULES(MEDIA_VERSION(2000)),

	  XE_RTP_ACTIONS(SET(CSFE_CHICKEN1(0),

			     GHWSP_CSB_REPORT_DIS |

			     PPHWSP_CSB_AND_TIMESTAMP_REPORT_DIS,

			     XE_RTP_ACTION_FLAG(ENGINE_BASE)))

	},



	/* Xe2_HPM */



	{ XE_RTP_NAME("16021639441"),

	  XE_RTP_RULES(MEDIA_VERSION(1301)),

	  XE_RTP_ACTIONS(SET(CSFE_CHICKEN1(0),

			     GHWSP_CSB_REPORT_DIS |

			     PPHWSP_CSB_AND_TIMESTAMP_REPORT_DIS,

			     XE_RTP_ACTION_FLAG(ENGINE_BASE)))

	},



	/* Xe3_LPG */



	{ XE_RTP_NAME("14021402888"),