iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/xe/guc: Port Wa_22012773006 to xe_wa

Browse Source 
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>
This commit is contained in:
Lucas De Marchi
2023-05-26 09:43:50 -07:00
committed by Rodrigo Vivi
parent 9616e74b79
commit 7d356b25b3
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/xe/Makefile
View File

@ -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 $(generated_oob) &: $(obj)/xe_gen_wa_oob $(srctree)/$(src)/xe_wa_oob.rules
$(call cmd,wa_oob) $(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! # Please keep these build lists sorted!

6
drivers/gpu/drm/xe/xe_guc.c
View File

@ -5,6 +5,7 @@
#include "xe_guc.h" #include "xe_guc.h"
#include "generated/xe_wa_oob.h"
#include "regs/xe_gt_regs.h" #include "regs/xe_gt_regs.h"
#include "regs/xe_guc_regs.h" #include "regs/xe_guc_regs.h"
#include "xe_bo.h" #include "xe_bo.h"
@ -20,6 +21,7 @@
#include "xe_mmio.h" #include "xe_mmio.h"
#include "xe_platform_types.h" #include "xe_platform_types.h"
#include "xe_uc_fw.h" #include "xe_uc_fw.h"
#include "xe_wa.h"
#include "xe_wopcm.h" #include "xe_wopcm.h"
static struct xe_gt * 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); struct xe_gt *gt = guc_to_gt(guc);
u32 flags = 0; u32 flags = 0;
/* Wa_22012773006:gen11,gen12 < XeHP */ if (XE_WA(gt, 22012773006))
if (GRAPHICS_VER(xe) >= 11 &&
GRAPHICS_VERx100(xe) < 1250)
flags |= GUC_WA_POLLCS; flags |= GUC_WA_POLLCS;
/* Wa_16011759253 */ /* Wa_16011759253 */

1
drivers/gpu/drm/xe/xe_wa_oob.rules
View File

@ -0,0 +1 @@
22012773006 GRAPHICS_VERSION_RANGE(1200, 1250)