diff options
| author | Lucas De Marchi <lucas.demarchi@intel.com> | 2023-05-26 19:43:54 +0300 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2023-12-20 02:34:03 +0300 |
| commit | 63bbd800ff013d2e6053ce94524e3219cabd8315 (patch) | |
| tree | 709c4bb80a43f1e9c38156f4743f3a69d0ddc2ed | |
| parent | bb0f2e05ad6c5a9f1fa325f847ea5a82002ede1d (diff) | |
| download | linux-63bbd800ff013d2e6053ce94524e3219cabd8315.tar.xz | |
drm/xe/guc: Port Wa_22012727170/Wa_22012727685 to xe_wa
Wa_22012727170 and Wa_22012727685 apply to DG2 using the same action and
conditions. Add both to the oob rules so they are both reported as
active.
Do not Wa_22012727170 to PVC and MTL since only early A* steppings are
affected.
v2: Remove DG2_G10 from Wa_22012727685 to match current WA database
(Matt Roper)
v3: GRAPHICS_STEP(A0, FOREVER) can be left alone for DG2 as this means
all steppings
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Link: https://lore.kernel.org/r/20230526164358.86393-18-lucas.demarchi@intel.com
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
| -rw-r--r-- | drivers/gpu/drm/xe/xe_guc.c | 8 | ||||
| -rw-r--r-- | drivers/gpu/drm/xe/xe_wa_oob.rules | 3 |
2 files changed, 4 insertions, 7 deletions
diff --git a/drivers/gpu/drm/xe/xe_guc.c b/drivers/gpu/drm/xe/xe_guc.c index 5eccc4b67381..1291f71348db 100644 --- a/drivers/gpu/drm/xe/xe_guc.c +++ b/drivers/gpu/drm/xe/xe_guc.c @@ -161,13 +161,7 @@ static u32 guc_ctl_wa_flags(struct xe_guc *guc) if (XE_WA(gt, 16011777198)) flags |= GUC_WA_RCS_RESET_BEFORE_RC6; - /* - * Wa_22012727170 - * Wa_22012727685 - */ - if (IS_SUBPLATFORM_STEP(xe, XE_DG2, XE_SUBPLATFORM_DG2_G10, STEP_A0, STEP_C0) || - IS_SUBPLATFORM_STEP(xe, XE_DG2, XE_SUBPLATFORM_DG2_G11, STEP_A0, - STEP_FOREVER)) + if (XE_WA(gt, 22012727170) || XE_WA(gt, 22012727685)) flags |= GUC_WA_CONTEXT_ISOLATION; /* Wa_16015675438, Wa_18020744125 */ diff --git a/drivers/gpu/drm/xe/xe_wa_oob.rules b/drivers/gpu/drm/xe/xe_wa_oob.rules index 3d4304b7111e..5b1beb2cf19f 100644 --- a/drivers/gpu/drm/xe/xe_wa_oob.rules +++ b/drivers/gpu/drm/xe/xe_wa_oob.rules @@ -4,3 +4,6 @@ 14012197797 PLATFORM(DG2), GRAPHICS_STEP(A0, B0) 16011777198 SUBPLATFORM(DG2, G10), GRAPHICS_STEP(A0, C0) SUBPLATFORM(DG2, G11), GRAPHICS_STEP(A0, B0) +22012727170 SUBPLATFORM(DG2, G10), GRAPHICS_STEP(A0, C0) + SUBPLATFORM(DG2, G11) +22012727685 SUBPLATFORM(DG2, G11) |