diff options
| author | Lucas De Marchi <lucas.demarchi@intel.com> | 2023-05-26 19:43:55 +0300 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2023-12-20 02:34:03 +0300 |
| commit | 2b48b0df30cea3a617a69e44ca69bec7f01ed276 (patch) | |
| tree | 328239198fd811bd0ea73714d1fd64f1d97f0b04 | |
| parent | 63bbd800ff013d2e6053ce94524e3219cabd8315 (diff) | |
| download | linux-2b48b0df30cea3a617a69e44ca69bec7f01ed276.tar.xz | |
drm/xe/guc: Port Wa_16015675438/Wa_18020744125 to xe_wa
Wa_16015675438 and Wa_18020744125 apply to DG2 using the same action and
conditions. Add both to the oob rules so they are both reported as
active. Note that previously they were not checking by platform or IP
version, hence making them not future-proof. Those workarounds should
only be active in PVC and DG2, besides the check for "no render engine".
v2: From current WA database, Wa_16015675438 applies to all DG2
subplatforms except G11. Migrate condition to use subplatform and
remove G11 from the match (Matt Roper)
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Link: https://lore.kernel.org/r/20230526164358.86393-19-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 | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/xe/xe_wa_oob.rules | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/drivers/gpu/drm/xe/xe_guc.c b/drivers/gpu/drm/xe/xe_guc.c index 1291f71348db..cc58a2092236 100644 --- a/drivers/gpu/drm/xe/xe_guc.c +++ b/drivers/gpu/drm/xe/xe_guc.c @@ -164,8 +164,8 @@ static u32 guc_ctl_wa_flags(struct xe_guc *guc) if (XE_WA(gt, 22012727170) || XE_WA(gt, 22012727685)) flags |= GUC_WA_CONTEXT_ISOLATION; - /* Wa_16015675438, Wa_18020744125 */ - if (!xe_hw_engine_mask_per_class(gt, XE_ENGINE_CLASS_RENDER)) + if ((XE_WA(gt, 16015675438) || XE_WA(gt, 18020744125)) && + !xe_hw_engine_mask_per_class(gt, XE_ENGINE_CLASS_RENDER)) flags |= GUC_WA_RCS_REGS_IN_CCS_REGS_LIST; /* Wa_1509372804 */ diff --git a/drivers/gpu/drm/xe/xe_wa_oob.rules b/drivers/gpu/drm/xe/xe_wa_oob.rules index 5b1beb2cf19f..ebb576f27b3e 100644 --- a/drivers/gpu/drm/xe/xe_wa_oob.rules +++ b/drivers/gpu/drm/xe/xe_wa_oob.rules @@ -7,3 +7,7 @@ 22012727170 SUBPLATFORM(DG2, G10), GRAPHICS_STEP(A0, C0) SUBPLATFORM(DG2, G11) 22012727685 SUBPLATFORM(DG2, G11) +16015675438 PLATFORM(PVC) + SUBPLATFORM(DG2, G10) + SUBPLATFORM(DG2, G12) +18020744125 PLATFORM(PVC) |