diff options
| author | Lucas De Marchi <lucas.demarchi@intel.com> | 2023-05-26 09:43:50 -0700 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2023-12-19 18:34:03 -0500 |
| commit | 7d356b25b32eec2a33bf2bc67974ef56f0778a7c (patch) | |
| tree | 389d614c634fd7bfd4959c512f0d2d47b738c219 | |
| parent | 9616e74b796c752ec29c3c83f3e33277d2b25b8e (diff) | |
| download | lwn-7d356b25b32eec2a33bf2bc67974ef56f0778a7c.tar.gz lwn-7d356b25b32eec2a33bf2bc67974ef56f0778a7c.zip | |
drm/xe/guc: Port Wa_22012773006 to xe_wa
Let xe_guc.c start using XE_WA() for workarounds, starting from a simple
one: Wa_22012773006. It's also changed to start with graphics version
12, since that is the first supported by xe.
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Link: https://lore.kernel.org/r/20230526164358.86393-14-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/Makefile | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/xe/xe_guc.c | 6 | ||||
| -rw-r--r-- | drivers/gpu/drm/xe/xe_wa_oob.rules | 1 |
3 files changed, 5 insertions, 4 deletions
diff --git a/drivers/gpu/drm/xe/Makefile b/drivers/gpu/drm/xe/Makefile index b9d3553ab476..a685e39d6b44 100644 --- a/drivers/gpu/drm/xe/Makefile +++ b/drivers/gpu/drm/xe/Makefile @@ -40,7 +40,7 @@ quiet_cmd_wa_oob = GEN $(notdir $(generated_oob)) $(generated_oob) &: $(obj)/xe_gen_wa_oob $(srctree)/$(src)/xe_wa_oob.rules $(call cmd,wa_oob) -$(obj)/xe_wa.o: $(generated_oob) +$(obj)/xe_guc.o $(obj)/xe_wa.o: $(generated_oob) # Please keep these build lists sorted! diff --git a/drivers/gpu/drm/xe/xe_guc.c b/drivers/gpu/drm/xe/xe_guc.c index a8e249205bff..08362db6a886 100644 --- a/drivers/gpu/drm/xe/xe_guc.c +++ b/drivers/gpu/drm/xe/xe_guc.c @@ -5,6 +5,7 @@ #include "xe_guc.h" +#include "generated/xe_wa_oob.h" #include "regs/xe_gt_regs.h" #include "regs/xe_guc_regs.h" #include "xe_bo.h" @@ -20,6 +21,7 @@ #include "xe_mmio.h" #include "xe_platform_types.h" #include "xe_uc_fw.h" +#include "xe_wa.h" #include "xe_wopcm.h" static struct xe_gt * @@ -134,9 +136,7 @@ static u32 guc_ctl_wa_flags(struct xe_guc *guc) struct xe_gt *gt = guc_to_gt(guc); u32 flags = 0; - /* Wa_22012773006:gen11,gen12 < XeHP */ - if (GRAPHICS_VER(xe) >= 11 && - GRAPHICS_VERx100(xe) < 1250) + if (XE_WA(gt, 22012773006)) flags |= GUC_WA_POLLCS; /* Wa_16011759253 */ diff --git a/drivers/gpu/drm/xe/xe_wa_oob.rules b/drivers/gpu/drm/xe/xe_wa_oob.rules index e69de29bb2d1..b54f70eeccf4 100644 --- a/drivers/gpu/drm/xe/xe_wa_oob.rules +++ b/drivers/gpu/drm/xe/xe_wa_oob.rules @@ -0,0 +1 @@ +22012773006 GRAPHICS_VERSION_RANGE(1200, 1250) |