Skip to content

Commit a4660bd

Browse files
guludorodrigovivi
authored andcommitted
drm/xe: Define and use MCR version of COMMON_SLICE_CHICKEN1
The register COMMON_SLICE_CHICKEN1 is a MCR register on Xe2. Let's make sure to define a MCR version of it and use it for the relevant IP versions. Use XEHP_ as prefix for the register name, since it is MCR as of Xe_HP. Fixes: a5d2219 ("drm/xe/xe2_hpg: Add set of workarounds") Fixes: 9f18b55 ("drm/xe/xe2: Add workaround 18033852989") Bspec: 66534, 71185 Reviewed-by: Matt Roper <matthew.d.roper@intel.com> Link: https://patch.msgid.link/20260514-rtp-mcr-check-v3-2-30dd47855fee@intel.com Signed-off-by: Gustavo Sousa <gustavo.sousa@intel.com> (cherry picked from commit a672725) Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
1 parent 16be14e commit a4660bd

2 files changed

Lines changed: 2 additions & 1 deletion

File tree

drivers/gpu/drm/xe/regs/xe_gt_regs.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@
156156
#define MSAA_OPTIMIZATION_REDUC_DISABLE REG_BIT(11)
157157

158158
#define COMMON_SLICE_CHICKEN1 XE_REG(0x7010, XE_REG_OPTION_MASKED)
159+
#define XEHP_COMMON_SLICE_CHICKEN1 XE_REG_MCR(0x7010, XE_REG_OPTION_MASKED)
159160
#define DISABLE_BOTTOM_CLIP_RECTANGLE_TEST REG_BIT(14)
160161

161162
#define HIZ_CHICKEN XE_REG(0x7018, XE_REG_OPTION_MASKED)

drivers/gpu/drm/xe/xe_wa.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -651,7 +651,7 @@ static const struct xe_rtp_entry_sr lrc_was[] = {
651651
},
652652
{ XE_RTP_NAME("18033852989"),
653653
XE_RTP_RULES(GRAPHICS_VERSION_RANGE(2001, 2004), ENGINE_CLASS(RENDER)),
654-
XE_RTP_ACTIONS(SET(COMMON_SLICE_CHICKEN1, DISABLE_BOTTOM_CLIP_RECTANGLE_TEST))
654+
XE_RTP_ACTIONS(SET(XEHP_COMMON_SLICE_CHICKEN1, DISABLE_BOTTOM_CLIP_RECTANGLE_TEST))
655655
},
656656
{ XE_RTP_NAME("15016589081"),
657657
XE_RTP_RULES(GRAPHICS_VERSION_RANGE(2001, 2004), ENGINE_CLASS(RENDER)),

0 commit comments

Comments
 (0)