drm/xe/guc: Port Wa_1509372804 to xe_wa

Port Wa_1509372804 to xe_wa so it's reported as active.

v2: Match workaround database, starting from A0 stepping (Matt Roper)

Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Link: https://lore.kernel.org/r/20230526164358.86393-20-lucas.demarchi@intel.com
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

diff --git a/drivers/gpu/drm/xe/xe_guc.c b/drivers/gpu/drm/xe/xe_guc.c
index cc58a209223677b1ad4afdeaf9a6745c2fe6c5fd..3ed460d3b6ca887e160cd4d18a3078edb9471ff8 100644 (file)
--- a/drivers/gpu/drm/xe/xe_guc.c
+++ b/drivers/gpu/drm/xe/xe_guc.c
@@ -168,8 +168,7 @@ static u32 guc_ctl_wa_flags(struct xe_guc *guc)
            !xe_hw_engine_mask_per_class(gt, XE_ENGINE_CLASS_RENDER))
                flags |= GUC_WA_RCS_REGS_IN_CCS_REGS_LIST;
 
-       /* Wa_1509372804 */
-       if (IS_PLATFORM_STEP(xe, XE_PVC, STEP_B0, STEP_C0))
+       if (XE_WA(gt, 1509372804))
                flags |= GUC_WA_RENDER_RST_RC6_EXIT;
 
        return flags;

diff --git a/drivers/gpu/drm/xe/xe_wa_oob.rules b/drivers/gpu/drm/xe/xe_wa_oob.rules
index ebb576f27b3eecd90841c065dceda93ba3877029..f6c4a0e055e01d503a403795bc0df12e9e42b0e2 100644 (file)
--- a/drivers/gpu/drm/xe/xe_wa_oob.rules
+++ b/drivers/gpu/drm/xe/xe_wa_oob.rules
@@ -11,3 +11,4 @@
                SUBPLATFORM(DG2, G10)
                SUBPLATFORM(DG2, G12)
 18020744125    PLATFORM(PVC)
+1509372804     PLATFORM(PVC), GRAPHICS_STEP(A0, C0)