[PATCH 4/4] drm/xe/rtp: Remove redundant rule to omit VF

[Michal Wajdeczko]

After recent updates to RTP processing which to not enable
rules when running on the VF driver, explicit disabling of
rule using FUNC(xe_rtp_match_not_sriov_vf) is now redundant.

This patch reverts commit 70b8e6e3226f ("drm/xe/vf: Don't
apply Wa_22019338487 for VF") and commit c2e52eb73d99
("drm/xe/rtp: Add match helper to omit SR-IOV VF device")

Signed-off-by: Michal Wajdeczko <michal.wajdeczko at intel.com>
Cc: Marcin Bernatowicz <marcin.bernatowicz at linux.intel.com>
Cc: Lucas De Marchi <lucas.demarchi at intel.com>
Cc: Matt Roper <matthew.d.roper at intel.com>
---
 drivers/gpu/drm/xe/xe_rtp.c        |  5 -----
 drivers/gpu/drm/xe/xe_rtp.h        | 11 -----------
 drivers/gpu/drm/xe/xe_wa_oob.rules |  2 +-
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/drivers/gpu/drm/xe/xe_rtp.c b/drivers/gpu/drm/xe/xe_rtp.c
index b607be981590..ab1901e39c44 100644
--- a/drivers/gpu/drm/xe/xe_rtp.c
+++ b/drivers/gpu/drm/xe/xe_rtp.c
@@ -358,8 +358,3 @@ bool xe_rtp_match_first_gslice_fused_off(const struct xe_gt *gt,
 	return dss >= dss_per_gslice;
 }
 
-bool xe_rtp_match_not_sriov_vf(const struct xe_gt *gt,
-			       const struct xe_hw_engine *hwe)
-{
-	return !IS_SRIOV_VF(gt_to_xe(gt));
-}
diff --git a/drivers/gpu/drm/xe/xe_rtp.h b/drivers/gpu/drm/xe/xe_rtp.h
index 7874ea8588db..7a4f018ddcb9 100644
--- a/drivers/gpu/drm/xe/xe_rtp.h
+++ b/drivers/gpu/drm/xe/xe_rtp.h
@@ -484,15 +484,4 @@ bool xe_rtp_match_first_render_or_compute(const struct xe_gt *gt,
 bool xe_rtp_match_first_gslice_fused_off(const struct xe_gt *gt,
 					 const struct xe_hw_engine *hwe);
 
-/*
- * xe_rtp_match_not_sriov_vf - Match when not on SR-IOV VF device
- *
- * @gt: GT structure
- * @hwe: Engine instance
- *
- * Returns: true if device is not VF, false otherwise.
- */
-bool xe_rtp_match_not_sriov_vf(const struct xe_gt *gt,
-			       const struct xe_hw_engine *hwe);
-
 #endif
diff --git a/drivers/gpu/drm/xe/xe_wa_oob.rules b/drivers/gpu/drm/xe/xe_wa_oob.rules
index 228436532282..c7f6ee1a8c74 100644
--- a/drivers/gpu/drm/xe/xe_wa_oob.rules
+++ b/drivers/gpu/drm/xe/xe_wa_oob.rules
@@ -35,7 +35,7 @@
 		GRAPHICS_VERSION(2004)
 22019338487	MEDIA_VERSION(2000)
 		GRAPHICS_VERSION(2001)
-		MEDIA_VERSION(3000), MEDIA_STEP(A0, B0), FUNC(xe_rtp_match_not_sriov_vf)
+		MEDIA_VERSION(3000), MEDIA_STEP(A0, B0)
 22019338487_display	PLATFORM(LUNARLAKE)
 16023588340	GRAPHICS_VERSION(2001)
 14019789679	GRAPHICS_VERSION(1255)
-- 
2.47.1