Skip to content

Commit 768fe28

Browse files
committed
drm/i915/xehpsdv: Define steering tables
Define and initialize the MMIO ranges for which XeHP SDV requires MSLICE and LNCF steering. Bspec: 66534 Cc: Tvrtko Ursulin <[email protected]> Cc: Daniele Ceraolo Spurio <[email protected]> Signed-off-by: Matt Roper <[email protected]> Reviewed-by: Lucas De Marchi <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 3ffe82d commit 768fe28

File tree

2 files changed

+27
-3
lines changed

2 files changed

+27
-3
lines changed

drivers/gpu/drm/i915/gt/intel_gt.c

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,20 @@ static const struct intel_mmio_range icl_l3bank_steering_table[] = {
8989
{},
9090
};
9191

92+
static const struct intel_mmio_range xehpsdv_mslice_steering_table[] = {
93+
{ 0x004000, 0x004AFF },
94+
{ 0x00C800, 0x00CFFF },
95+
{ 0x00DD00, 0x00DDFF },
96+
{ 0x00E900, 0x00FFFF }, /* 0xEA00 - OxEFFF is unused */
97+
{},
98+
};
99+
100+
static const struct intel_mmio_range xehpsdv_lncf_steering_table[] = {
101+
{ 0x00B000, 0x00B0FF },
102+
{ 0x00D800, 0x00D8FF },
103+
{},
104+
};
105+
92106
static u16 slicemask(struct intel_gt *gt, int count)
93107
{
94108
u64 dss_mask = intel_sseu_get_subslices(&gt->info.sseu, 0);
@@ -115,7 +129,10 @@ int intel_gt_init_mmio(struct intel_gt *gt)
115129
(intel_uncore_read(gt->uncore, GEN10_MIRROR_FUSE3) &
116130
GEN12_MEML3_EN_MASK);
117131

118-
if (GRAPHICS_VER(i915) >= 11 &&
132+
if (IS_XEHPSDV(i915)) {
133+
gt->steering_table[MSLICE] = xehpsdv_mslice_steering_table;
134+
gt->steering_table[LNCF] = xehpsdv_lncf_steering_table;
135+
} else if (GRAPHICS_VER(i915) >= 11 &&
119136
GRAPHICS_VER_FULL(i915) < IP_VER(12, 50)) {
120137
gt->steering_table[L3BANK] = icl_l3bank_steering_table;
121138
gt->info.l3bank_mask =

drivers/gpu/drm/i915/gt/intel_workarounds.c

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -934,7 +934,6 @@ icl_wa_init_mcr(struct drm_i915_private *i915, struct i915_wa_list *wal)
934934
__add_mcr_wa(i915, wal, slice, subslice);
935935
}
936936

937-
__maybe_unused
938937
static void
939938
xehp_init_mcr(struct intel_gt *gt, struct i915_wa_list *wal)
940939
{
@@ -1136,10 +1135,18 @@ dg1_gt_workarounds_init(struct drm_i915_private *i915, struct i915_wa_list *wal)
11361135
VSUNIT_CLKGATE_DIS_TGL);
11371136
}
11381137

1138+
static void
1139+
xehpsdv_gt_workarounds_init(struct drm_i915_private *i915, struct i915_wa_list *wal)
1140+
{
1141+
xehp_init_mcr(&i915->gt, wal);
1142+
}
1143+
11391144
static void
11401145
gt_init_workarounds(struct drm_i915_private *i915, struct i915_wa_list *wal)
11411146
{
1142-
if (IS_DG1(i915))
1147+
if (IS_XEHPSDV(i915))
1148+
xehpsdv_gt_workarounds_init(i915, wal);
1149+
else if (IS_DG1(i915))
11431150
dg1_gt_workarounds_init(i915, wal);
11441151
else if (IS_TIGERLAKE(i915))
11451152
tgl_gt_workarounds_init(i915, wal);

0 commit comments

Comments
 (0)