Skip to content

Commit 6df5678

Browse files
guludorodrigovivi
authored andcommitted
drm/xe: Define and use MCR version of COMMON_SLICE_CHICKEN4
The register COMMON_SLICE_CHICKEN4 is a MCR register on both Xe2 and Xe3. 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. v2: - Also change for one entry in lrc_tunnings, which was caught by manual testing and add corresponging Fixes tag in commit message. (Gustavo) Fixes: 8d6f16f ("drm/xe: Extend Wa_22021007897 to Xe3 platforms") Fixes: e5c13e2 ("drm/xe/xe2hpg: Add Wa_22021007897") Fixes: 8ccf5f6 ("drm/xe/tuning: Apply windower hardware filtering setting on Xe3 and Xe3p") Bspec: 66534, 71185, 74417 Reviewed-by: Matt Roper <matthew.d.roper@intel.com> Link: https://patch.msgid.link/20260514-rtp-mcr-check-v3-3-30dd47855fee@intel.com Signed-off-by: Gustavo Sousa <gustavo.sousa@intel.com> (cherry picked from commit 75f65f1) Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
1 parent a4660bd commit 6df5678

3 files changed

Lines changed: 4 additions & 3 deletions

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
@@ -179,6 +179,7 @@
179179
#define XEHPG_SC_INSTDONE_EXTRA2 XE_REG_MCR(0x7108)
180180

181181
#define COMMON_SLICE_CHICKEN4 XE_REG(0x7300, XE_REG_OPTION_MASKED)
182+
#define XEHP_COMMON_SLICE_CHICKEN4 XE_REG_MCR(0x7300, XE_REG_OPTION_MASKED)
182183
#define SBE_PUSH_CONSTANT_BEHIND_FIX_ENABLE REG_BIT(12)
183184
#define DISABLE_TDC_LOAD_BALANCING_CALC REG_BIT(6)
184185
#define HW_FILTERING REG_BIT(5)

drivers/gpu/drm/xe/xe_tuning.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ static const struct xe_rtp_entry_sr engine_tunings[] = {
129129
static const struct xe_rtp_entry_sr lrc_tunings[] = {
130130
{ XE_RTP_NAME("Tuning: Windower HW Filtering"),
131131
XE_RTP_RULES(GRAPHICS_VERSION_RANGE(3000, 3599), ENGINE_CLASS(RENDER)),
132-
XE_RTP_ACTIONS(SET(COMMON_SLICE_CHICKEN4, HW_FILTERING))
132+
XE_RTP_ACTIONS(SET(XEHP_COMMON_SLICE_CHICKEN4, HW_FILTERING))
133133
},
134134

135135
/* DG2 */

drivers/gpu/drm/xe/xe_wa.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -754,7 +754,7 @@ static const struct xe_rtp_entry_sr lrc_was[] = {
754754
},
755755
{ XE_RTP_NAME("22021007897"),
756756
XE_RTP_RULES(GRAPHICS_VERSION_RANGE(2001, 2002), ENGINE_CLASS(RENDER)),
757-
XE_RTP_ACTIONS(SET(COMMON_SLICE_CHICKEN4, SBE_PUSH_CONSTANT_BEHIND_FIX_ENABLE))
757+
XE_RTP_ACTIONS(SET(XEHP_COMMON_SLICE_CHICKEN4, SBE_PUSH_CONSTANT_BEHIND_FIX_ENABLE))
758758
},
759759

760760
/* Xe3_LPG */
@@ -770,7 +770,7 @@ static const struct xe_rtp_entry_sr lrc_was[] = {
770770
},
771771
{ XE_RTP_NAME("22021007897"),
772772
XE_RTP_RULES(GRAPHICS_VERSION_RANGE(3000, 3005), ENGINE_CLASS(RENDER)),
773-
XE_RTP_ACTIONS(SET(COMMON_SLICE_CHICKEN4, SBE_PUSH_CONSTANT_BEHIND_FIX_ENABLE))
773+
XE_RTP_ACTIONS(SET(XEHP_COMMON_SLICE_CHICKEN4, SBE_PUSH_CONSTANT_BEHIND_FIX_ENABLE))
774774
},
775775
{ XE_RTP_NAME("14024681466"),
776776
XE_RTP_RULES(GRAPHICS_VERSION_RANGE(3000, 3005), ENGINE_CLASS(RENDER)),

0 commit comments

Comments
 (0)