Commit 490fa786 authored by Lucas De Marchi's avatar Lucas De Marchi
Browse files

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: default avatarMatt Roper <matthew.d.roper@intel.com>
Reviewed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Link: https://lore.kernel.org/r/20251016-xe3p-v3-19-3dd173a3097a@intel.com


Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
parent 832bfaf8

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

+2 −2
Original line number Diff line number Diff line
@@ -80,9 +80,9 @@ 
#define   GT_WAIT_SEMAPHORE_INTERRUPT		REG_BIT(11)

#define   GT_CONTEXT_SWITCH_INTERRUPT		REG_BIT(8)

#define   GSC_ER_COMPLETE			REG_BIT(5)

#define   GT_RENDER_PIPECTL_NOTIFY_INTERRUPT	REG_BIT(4)

#define   GT_FLUSH_COMPLETE_INTERRUPT	REG_BIT(4)

#define   GT_CS_MASTER_ERROR_INTERRUPT		REG_BIT(3)

#define   GT_RENDER_USER_INTERRUPT		REG_BIT(0)

#define   GT_MI_USER_INTERRUPT			REG_BIT(0)



/* irqs for OTHER_KCR_INSTANCE */

#define   KCR_PXP_STATE_TERMINATED_INTERRUPT		REG_BIT(1)

drivers/gpu/drm/xe/xe_hw_engine.c

+1 −1
Original line number Diff line number Diff line
@@ -904,7 +904,7 @@ void xe_hw_engine_handle_irq(struct xe_hw_engine *hwe, u16 intr_vec) 
	if (hwe->irq_handler)

		hwe->irq_handler(hwe, intr_vec);



	if (intr_vec & GT_RENDER_USER_INTERRUPT)

	if (intr_vec & GT_MI_USER_INTERRUPT)

		xe_hw_fence_irq_run(hwe->fence_irq);

}

drivers/gpu/drm/xe/xe_irq.c

+3 −3
Original line number Diff line number Diff line
@@ -147,10 +147,10 @@ void xe_irq_enable_hwe(struct xe_gt *gt) 
		return;



	if (xe_device_uc_enabled(xe)) {

		common_mask = GT_RENDER_USER_INTERRUPT |

			      GT_RENDER_PIPECTL_NOTIFY_INTERRUPT;

		common_mask = GT_MI_USER_INTERRUPT |

			      GT_FLUSH_COMPLETE_INTERRUPT;

	} else {

		common_mask = GT_RENDER_USER_INTERRUPT |

		common_mask = GT_MI_USER_INTERRUPT |

			      GT_CS_MASTER_ERROR_INTERRUPT |

			      GT_CONTEXT_SWITCH_INTERRUPT |

			      GT_WAIT_SEMAPHORE_INTERRUPT;

drivers/gpu/drm/xe/xe_memirq.c

+2 −2
Original line number Diff line number Diff line
@@ -434,8 +434,8 @@ static void memirq_dispatch_engine(struct xe_memirq *memirq, struct iosys_map *s 
{

	memirq_debug(memirq, "STATUS %s %*ph\n", hwe->name, 16, status->vaddr);



	if (memirq_received(memirq, status, ilog2(GT_RENDER_USER_INTERRUPT), hwe->name))

		xe_hw_engine_handle_irq(hwe, GT_RENDER_USER_INTERRUPT);

	if (memirq_received(memirq, status, ilog2(GT_MI_USER_INTERRUPT), hwe->name))

		xe_hw_engine_handle_irq(hwe, GT_MI_USER_INTERRUPT);

}



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