Commit 7b6f615d authored by Matt Roper's avatar Matt Roper
Browse files

drm/xe: Consolidate workaround entries for Wa_13012615864 



Wa_13012615864 applies to all graphics versions from 20.01 through 30.05
(inclusive).  Consolidate the RTP entries into a single range-based
entry.

Reviewed-by: default avatarShuicheng Lin <shuicheng.lin@intel.com>
Link: https://patch.msgid.link/20260220-forupstream-wa_cleanup-v2-14-b12005a05af6@intel.com


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

drivers/gpu/drm/xe/xe_wa.c

+5 −16
Original line number Diff line number Diff line
@@ -380,6 +380,11 @@ static const struct xe_rtp_entry_sr engine_was[] = { 
	  XE_RTP_RULES(GRAPHICS_VERSION_RANGE(2001, 3005), ENGINE_CLASS(RENDER)),

	  XE_RTP_ACTIONS(SET(HALF_SLICE_CHICKEN7, CLEAR_OPTIMIZATION_DISABLE))

	},

	{ XE_RTP_NAME("13012615864"),

	  XE_RTP_RULES(GRAPHICS_VERSION_RANGE(2001, 3005),

		       FUNC(xe_rtp_match_first_render_or_compute)),

	  XE_RTP_ACTIONS(SET(TDL_TSL_CHICKEN, RES_CHK_SPR_DIS))

	},



	/* TGL */
@@ -526,11 +531,6 @@ static const struct xe_rtp_entry_sr engine_was[] = { 
	  XE_RTP_RULES(GRAPHICS_VERSION(2004), FUNC(xe_rtp_match_first_render_or_compute)),

	  XE_RTP_ACTIONS(SET(TDL_TSL_CHICKEN, SLM_WMTP_RESTORE))

	},

	{ XE_RTP_NAME("13012615864"),

	  XE_RTP_RULES(GRAPHICS_VERSION(2004),

		       FUNC(xe_rtp_match_first_render_or_compute)),

	  XE_RTP_ACTIONS(SET(TDL_TSL_CHICKEN, RES_CHK_SPR_DIS))

	},

	{ XE_RTP_NAME("18041344222"),

	  XE_RTP_RULES(GRAPHICS_VERSION(2004),

		       FUNC(xe_rtp_match_first_render_or_compute),
@@ -555,11 +555,6 @@ static const struct xe_rtp_entry_sr engine_was[] = { 
		       FUNC(xe_rtp_match_first_render_or_compute)),

	  XE_RTP_ACTIONS(SET(TDL_TSL_CHICKEN, STK_ID_RESTRICT))

	},

	{ XE_RTP_NAME("13012615864"),

	  XE_RTP_RULES(GRAPHICS_VERSION_RANGE(2001, 2002),

		       FUNC(xe_rtp_match_first_render_or_compute)),

	  XE_RTP_ACTIONS(SET(TDL_TSL_CHICKEN, RES_CHK_SPR_DIS))

	},

	{ XE_RTP_NAME("18041344222"),

	  XE_RTP_RULES(GRAPHICS_VERSION_RANGE(2001, 2002),

		       FUNC(xe_rtp_match_first_render_or_compute),
@@ -587,12 +582,6 @@ static const struct xe_rtp_entry_sr engine_was[] = { 
		       FUNC(xe_rtp_match_first_render_or_compute)),

	  XE_RTP_ACTIONS(SET(TDL_CHICKEN, QID_WAIT_FOR_THREAD_NOT_RUN_DISABLE))

	},

	{ XE_RTP_NAME("13012615864"),

	  XE_RTP_RULES(GRAPHICS_VERSION_RANGE(3000, 3001), OR,

		       GRAPHICS_VERSION_RANGE(3003, 3005),

		       FUNC(xe_rtp_match_first_render_or_compute)),

	  XE_RTP_ACTIONS(SET(TDL_TSL_CHICKEN, RES_CHK_SPR_DIS))

	},

	{ XE_RTP_NAME("16023105232"),

	  XE_RTP_RULES(MEDIA_VERSION_RANGE(1301, 3000), OR,

		       GRAPHICS_VERSION_RANGE(2001, 3001)),