Skip to content

Commit 490fa78

Browse files
author
Lucas De Marchi
committed
drm/xe/irq: Rename bits used with all engines
Two bit fields have similar functionality across the interrupt vectors but are named "RENDER". Rename them to follow the bspec more closely and clear any confusion when using them for other engines. Bspec: 62353, 62354, 62355, 62346, 62345, 63341 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-19-3dd173a3097a@intel.com Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
1 parent 832bfaf commit 490fa78

4 files changed

Lines changed: 8 additions & 8 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@
8080
#define GT_WAIT_SEMAPHORE_INTERRUPT REG_BIT(11)
8181
#define GT_CONTEXT_SWITCH_INTERRUPT REG_BIT(8)
8282
#define GSC_ER_COMPLETE REG_BIT(5)
83-
#define GT_RENDER_PIPECTL_NOTIFY_INTERRUPT REG_BIT(4)
83+
#define GT_FLUSH_COMPLETE_INTERRUPT REG_BIT(4)
8484
#define GT_CS_MASTER_ERROR_INTERRUPT REG_BIT(3)
85-
#define GT_RENDER_USER_INTERRUPT REG_BIT(0)
85+
#define GT_MI_USER_INTERRUPT REG_BIT(0)
8686

8787
/* irqs for OTHER_KCR_INSTANCE */
8888
#define KCR_PXP_STATE_TERMINATED_INTERRUPT REG_BIT(1)

drivers/gpu/drm/xe/xe_hw_engine.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -904,7 +904,7 @@ void xe_hw_engine_handle_irq(struct xe_hw_engine *hwe, u16 intr_vec)
904904
if (hwe->irq_handler)
905905
hwe->irq_handler(hwe, intr_vec);
906906

907-
if (intr_vec & GT_RENDER_USER_INTERRUPT)
907+
if (intr_vec & GT_MI_USER_INTERRUPT)
908908
xe_hw_fence_irq_run(hwe->fence_irq);
909909
}
910910

drivers/gpu/drm/xe/xe_irq.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,10 +147,10 @@ void xe_irq_enable_hwe(struct xe_gt *gt)
147147
return;
148148

149149
if (xe_device_uc_enabled(xe)) {
150-
common_mask = GT_RENDER_USER_INTERRUPT |
151-
GT_RENDER_PIPECTL_NOTIFY_INTERRUPT;
150+
common_mask = GT_MI_USER_INTERRUPT |
151+
GT_FLUSH_COMPLETE_INTERRUPT;
152152
} else {
153-
common_mask = GT_RENDER_USER_INTERRUPT |
153+
common_mask = GT_MI_USER_INTERRUPT |
154154
GT_CS_MASTER_ERROR_INTERRUPT |
155155
GT_CONTEXT_SWITCH_INTERRUPT |
156156
GT_WAIT_SEMAPHORE_INTERRUPT;

drivers/gpu/drm/xe/xe_memirq.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -434,8 +434,8 @@ static void memirq_dispatch_engine(struct xe_memirq *memirq, struct iosys_map *s
434434
{
435435
memirq_debug(memirq, "STATUS %s %*ph\n", hwe->name, 16, status->vaddr);
436436

437-
if (memirq_received(memirq, status, ilog2(GT_RENDER_USER_INTERRUPT), hwe->name))
438-
xe_hw_engine_handle_irq(hwe, GT_RENDER_USER_INTERRUPT);
437+
if (memirq_received(memirq, status, ilog2(GT_MI_USER_INTERRUPT), hwe->name))
438+
xe_hw_engine_handle_irq(hwe, GT_MI_USER_INTERRUPT);
439439
}
440440

441441
static void memirq_dispatch_guc(struct xe_memirq *memirq, struct iosys_map *status,

0 commit comments

Comments
 (0)