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

drm/xe/wa_oob: Consolidate some OOB rules 



Given the new policy of allowing graphics/media IP ranges to extend over
unused IP versions, we can consolidate some of the OOB workaround rules
and simplify the table.  If new IP variants eventually show up that use
these unused versions (e.g., media version 30.01, graphics versions
20.03 / 30.02, etc.), and if an existing workaround does not extend to
that new intermediate version, the ranges will be split back apart as
part of the enablement work for that new IP version.

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


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

drivers/gpu/drm/xe/xe_wa_oob.rules

+8 −23
Original line number Diff line number Diff line
@@ -24,18 +24,9 @@ 
		MEDIA_VERSION(2000)

16022287689	GRAPHICS_VERSION(2001)

		GRAPHICS_VERSION(2004)

13011645652	GRAPHICS_VERSION(2004)

		GRAPHICS_VERSION_RANGE(3000, 3001)

		GRAPHICS_VERSION(3003)

		GRAPHICS_VERSION_RANGE(3004, 3005)

14022293748	GRAPHICS_VERSION_RANGE(2001, 2002)

		GRAPHICS_VERSION(2004)

		GRAPHICS_VERSION_RANGE(3000, 3005)

22019794406	GRAPHICS_VERSION_RANGE(2001, 2002)

		GRAPHICS_VERSION(2004)

		GRAPHICS_VERSION_RANGE(3000, 3001)

		GRAPHICS_VERSION(3003)

		GRAPHICS_VERSION_RANGE(3004, 3005)

13011645652	GRAPHICS_VERSION_RANGE(2004, 3005)

14022293748	GRAPHICS_VERSION_RANGE(2001, 3005)

22019794406	GRAPHICS_VERSION_RANGE(2001, 3005)

22019338487	MEDIA_VERSION(2000)

		GRAPHICS_VERSION(2001), FUNC(xe_rtp_match_not_sriov_vf)

		MEDIA_VERSION(3000), MEDIA_STEP(A0, B0), FUNC(xe_rtp_match_not_sriov_vf)
@@ -52,18 +43,12 @@ 
18013179988	GRAPHICS_VERSION(1255)

		GRAPHICS_VERSION_RANGE(1270, 1274)

1508761755	GRAPHICS_VERSION(1255)

16023105232	GRAPHICS_VERSION_RANGE(2001, 3001)

		MEDIA_VERSION_RANGE(1301, 3000)

		MEDIA_VERSION(3002)

		GRAPHICS_VERSION_RANGE(3003, 3005)

16026508708	GRAPHICS_VERSION_RANGE(1200, 3001)

		MEDIA_VERSION_RANGE(1300, 3000)

		MEDIA_VERSION(3002)

		GRAPHICS_VERSION_RANGE(3003, 3005)

16023105232	GRAPHICS_VERSION_RANGE(2001, 3005)

		MEDIA_VERSION_RANGE(1301, 3002)

16026508708	GRAPHICS_VERSION_RANGE(1200, 3005)

		MEDIA_VERSION_RANGE(1300, 3002)

14020001231	GRAPHICS_VERSION_RANGE(2001,2004), FUNC(xe_rtp_match_psmi_enabled)

		MEDIA_VERSION(2000), FUNC(xe_rtp_match_psmi_enabled)

		MEDIA_VERSION(3000), FUNC(xe_rtp_match_psmi_enabled)

		MEDIA_VERSION(3002), FUNC(xe_rtp_match_psmi_enabled)

		MEDIA_VERSION_RANGE(2000, 3002), FUNC(xe_rtp_match_psmi_enabled)

16023683509	MEDIA_VERSION(2000), FUNC(xe_rtp_match_psmi_enabled)

		MEDIA_VERSION(3000), MEDIA_STEP(A0, B0), FUNC(xe_rtp_match_psmi_enabled)