From a9bd807eb16be11e11f6c6d3921119381cc43135 Mon Sep 17 00:00:00 2001 From: Lucas De Marchi Date: Fri, 26 May 2023 09:43:38 -0700 Subject: [PATCH] drm/xe: Fix Wa_22011802037 annotation It was missing one digit, so not showing up as a proper WA number. Add the missing number and annotate it with a FIXME as there are more to be implemented to consider this WA done: ensure CS is stop before doing a reset, wait for pending. Also, this WA applies to platforms up to graphics version 1270 (with the exception of MTL A*, that are not supported in xe). Fix platform check. Link: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/284 Reviewed-by: Matt Roper Link: https://lore.kernel.org/r/20230526164358.86393-2-lucas.demarchi@intel.com Signed-off-by: Lucas De Marchi Signed-off-by: Rodrigo Vivi --- drivers/gpu/drm/xe/xe_guc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_guc.c b/drivers/gpu/drm/xe/xe_guc.c index 71f18b32d09b..a8e249205bff 100644 --- a/drivers/gpu/drm/xe/xe_guc.c +++ b/drivers/gpu/drm/xe/xe_guc.c @@ -160,9 +160,11 @@ static u32 guc_ctl_wa_flags(struct xe_guc *guc) flags |= GUC_WA_DUAL_QUEUE; /* - * Wa_2201180203 + * Wa_22011802037: FIXME - there's more to be done than simply setting + * this flag: make sure each CS is stopped when preparing for GT reset + * and wait for pending MI_FW. */ - if (GRAPHICS_VER(xe) <= 12) + if (GRAPHICS_VERx100(xe) < 1270) flags |= GUC_WA_PRE_PARSER; /* Wa_16011777198 */