Skip to content

Commit 7fd3fa0

Browse files
baluviveklucasdemarchi
authored andcommitted
drm/xe: Set mask bits for CCS_MODE register
CCS_MODE register requires setting mask bits from Xe2+ platforms. Set the mask bits unconditionally, as those bits are unused for older platforms. Signed-off-by: Balasubramani Vivekanandan <[email protected]> Cc: [email protected] # v6.11+ Reviewed-by: Lucas De Marchi <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] Signed-off-by: Lucas De Marchi <[email protected]> (cherry picked from commit 23ea2c7) [ Fix conflict with mmio refactors ] Signed-off-by: Lucas De Marchi <[email protected]>
1 parent 59b723c commit 7fd3fa0

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@
517517
* [4-6] RSVD
518518
* [7] Disabled
519519
*/
520-
#define CCS_MODE XE_REG(0x14804)
520+
#define CCS_MODE XE_REG(0x14804, XE_REG_OPTION_MASKED)
521521
#define CCS_MODE_CSLICE_0_3_MASK REG_GENMASK(11, 0) /* 3 bits per cslice */
522522
#define CCS_MODE_CSLICE_MASK 0x7 /* CCS0-3 + rsvd */
523523
#define CCS_MODE_CSLICE_WIDTH ilog2(CCS_MODE_CSLICE_MASK + 1)

drivers/gpu/drm/xe/xe_gt_ccs_mode.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,12 @@ static void __xe_gt_apply_ccs_mode(struct xe_gt *gt, u32 num_engines)
6868
}
6969
}
7070

71+
/*
72+
* Mask bits need to be set for the register. Though only Xe2+
73+
* platforms require setting of mask bits, it won't harm for older
74+
* platforms as these bits are unused there.
75+
*/
76+
mode |= CCS_MODE_CSLICE_0_3_MASK << 16;
7177
xe_mmio_write32(gt, CCS_MODE, mode);
7278

7379
xe_gt_dbg(gt, "CCS_MODE=%x config:%08x, num_engines:%d, num_slices:%d\n",

0 commit comments

Comments
 (0)