Skip to content

Commit 22b7117

Browse files
author
Lucas De Marchi
committed
drm/xe/irq: Check fuse mask for media engines
Just like the other engines, check xe_hw_engine_mask_per_class() for VCS and VECS to account for architectural availability of those registers. With that, all the possibly available media engines can have their interrupts enabled. Bspec: 54030 Suggested-by: Matt Roper <matthew.d.roper@intel.com> Reviewed-by: Matt Roper <matthew.d.roper@intel.com> Link: https://lore.kernel.org/r/20251016-xe3p-v3-20-3dd173a3097a@intel.com Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
1 parent 490fa78 commit 22b7117

2 files changed

Lines changed: 17 additions & 3 deletions

File tree

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,10 @@
6565
#define BCS_RSVD_INTR_MASK XE_REG(0x1900a0, XE_REG_OPTION_VF)
6666
#define VCS0_VCS1_INTR_MASK XE_REG(0x1900a8, XE_REG_OPTION_VF)
6767
#define VCS2_VCS3_INTR_MASK XE_REG(0x1900ac, XE_REG_OPTION_VF)
68+
#define VCS4_VCS5_INTR_MASK XE_REG(0x1900b0, XE_REG_OPTION_VF)
69+
#define VCS6_VCS7_INTR_MASK XE_REG(0x1900b4, XE_REG_OPTION_VF)
6870
#define VECS0_VECS1_INTR_MASK XE_REG(0x1900d0, XE_REG_OPTION_VF)
71+
#define VECS2_VECS3_INTR_MASK XE_REG(0x1900d4, XE_REG_OPTION_VF)
6972
#define HECI2_RSVD_INTR_MASK XE_REG(0x1900e4)
7073
#define GUC_SG_INTR_MASK XE_REG(0x1900e8, XE_REG_OPTION_VF)
7174
#define GPM_WGBOXPERF_INTR_MASK XE_REG(0x1900ec, XE_REG_OPTION_VF)

drivers/gpu/drm/xe/xe_irq.c

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,8 @@ void xe_irq_enable_hwe(struct xe_gt *gt)
205205
}
206206

207207
if (xe_gt_is_media_type(gt) || MEDIA_VER(xe) < 13) {
208+
u32 vcs_fuse_mask = xe_hw_engine_mask_per_class(gt, XE_ENGINE_CLASS_VIDEO_DECODE);
209+
u32 vecs_fuse_mask = xe_hw_engine_mask_per_class(gt, XE_ENGINE_CLASS_VIDEO_ENHANCE);
208210
u32 other_fuse_mask = xe_hw_engine_mask_per_class(gt, XE_ENGINE_CLASS_OTHER);
209211

210212
/* Enable interrupts for each engine class */
@@ -215,12 +217,21 @@ void xe_irq_enable_hwe(struct xe_gt *gt)
215217
/* Unmask interrupts for each engine instance */
216218
val = ~(REG_FIELD_PREP(ENGINE1_MASK, vcs_mask) |
217219
REG_FIELD_PREP(ENGINE0_MASK, vcs_mask));
218-
xe_mmio_write32(mmio, VCS0_VCS1_INTR_MASK, val);
219-
xe_mmio_write32(mmio, VCS2_VCS3_INTR_MASK, val);
220+
if (vcs_fuse_mask & (BIT(0) | BIT(1)))
221+
xe_mmio_write32(mmio, VCS0_VCS1_INTR_MASK, val);
222+
if (vcs_fuse_mask & (BIT(2) | BIT(3)))
223+
xe_mmio_write32(mmio, VCS2_VCS3_INTR_MASK, val);
224+
if (vcs_fuse_mask & (BIT(4) | BIT(5)))
225+
xe_mmio_write32(mmio, VCS4_VCS5_INTR_MASK, val);
226+
if (vcs_fuse_mask & (BIT(6) | BIT(7)))
227+
xe_mmio_write32(mmio, VCS6_VCS7_INTR_MASK, val);
220228

221229
val = ~(REG_FIELD_PREP(ENGINE1_MASK, vecs_mask) |
222230
REG_FIELD_PREP(ENGINE0_MASK, vecs_mask));
223-
xe_mmio_write32(mmio, VECS0_VECS1_INTR_MASK, val);
231+
if (vecs_fuse_mask & (BIT(0) | BIT(1)))
232+
xe_mmio_write32(mmio, VECS0_VECS1_INTR_MASK, val);
233+
if (vecs_fuse_mask & (BIT(2) | BIT(3)))
234+
xe_mmio_write32(mmio, VECS2_VECS3_INTR_MASK, val);
224235

225236
/*
226237
* the heci2 interrupt is enabled via the same register as the

0 commit comments

Comments
 (0)