[Intel-xe] [PATCH v2 20/30] drm/xe: Interrupts are delivered per-tile, not per-GT
Lucas De Marchi
lucas.demarchi at intel.com
Fri May 26 22:16:02 UTC 2023
On Fri, May 19, 2023 at 04:18:17PM -0700, Matt Roper wrote:
>IRQ delivery and handling needs to be handled on a per-tile basis. Note
>that this is true even for the "GT interrupts" relating to engines and
>GuCs --- the interrupts relating to both GTs get raised through a single
>set of registers in the tile's sgunit range.
>
>On true multi-tile platforms, interrupts on remote tiles are internally
>forwarded to the root tile; the first thing the top-level interrupt
>handler should do is consult the root tile's instance of
>DG1_MSTR_TILE_INTR to determine which tile(s) had interrupts. This
>register is also responsible for enabling/disabling top-level reporting
>of any interrupts to the OS. Although this register technically exists
>on all tiles, it should only be used on the root tile.
>
>The (mis)use of struct xe_gt as a target for MMIO operations in the
>driver makes the code somewhat confusing since we wind up needing a GT
>pointer to handle programming that's unrelated to the GT. To mitigate
>this confusion, all of the xe_gt structures used solely as an MMIO
>target in interrupt code are renamed to 'mmio' so that it's clear that
I still think it's odd to call an instance of `struct xe_gt` as mmio and
if we decide to create a better abstraction for the mmio, we may have in
future a struct xe_mmio that will clash here. Hence I think it would be
better to call it mmio_gt. But I won´t insist and leave this just as
feedback.
Reviewing this after applying it locally and using --color-words was
much easier
Reviewed-by: Lucas De Marchi <lucas.demarchi at intel.com>
Lucas De Marchi
>the structure being passed does not necessarily relate to any specific
>GT (primary or media) that we might be dealing with interrupts for.
>Reworking the driver's MMIO handling to not be dependent on xe_gt is
>planned as a future patch series.
>
>Note that GT initialization code currently calls xe_gt_irq_postinstall()
>in an attempt to enable the HWE interrupts for the GT being initialized.
>Unfortunately xe_gt_irq_postinstall() doesn't really match its name and
>does a bunch of other stuff unrelated to the GT interrupts (such as
>enabling the top-level device interrupts). That will be addressed in
>future patches.
>
>v2:
> - Clarify commit message with explanation of why DG1_MSTR_TILE_INTR is
> only used on the root tile, even though it's an sgunit register that
> is technically present in each tile's MMIO space. (Aravind)
> - Also clarify that the xe_gt used as a target for MMIO operations may
> or may not relate to the GT we're dealing with for interrupts.
> (Lucas)
>
>Cc: Aravind Iddamsetty <aravind.iddamsetty at intel.com>
>Signed-off-by: Matt Roper <matthew.d.roper at intel.com>
>---
> drivers/gpu/drm/xe/xe_gt.c | 2 +-
> drivers/gpu/drm/xe/xe_irq.c | 334 ++++++++++++++++++++----------------
> drivers/gpu/drm/xe/xe_irq.h | 4 +-
> 3 files changed, 187 insertions(+), 153 deletions(-)
>
>diff --git a/drivers/gpu/drm/xe/xe_gt.c b/drivers/gpu/drm/xe/xe_gt.c
>index 0abd0d912610..290935e46059 100644
>--- a/drivers/gpu/drm/xe/xe_gt.c
>+++ b/drivers/gpu/drm/xe/xe_gt.c
>@@ -304,7 +304,7 @@ static int gt_fw_domain_init(struct xe_gt *gt)
> gt->info.engine_mask = gt->info.__engine_mask;
>
> /* Enables per hw engine IRQs */
>- xe_gt_irq_postinstall(gt);
>+ xe_gt_irq_postinstall(gt_to_tile(gt));
>
> /* Rerun MCR init as we now have hw engine list */
> xe_gt_mcr_init(gt);
>diff --git a/drivers/gpu/drm/xe/xe_irq.c b/drivers/gpu/drm/xe/xe_irq.c
>index 654c34a5b99a..ad2f73b2a031 100644
>--- a/drivers/gpu/drm/xe/xe_irq.c
>+++ b/drivers/gpu/drm/xe/xe_irq.c
>@@ -27,60 +27,66 @@
> #define IIR(offset) XE_REG(offset + 0x8)
> #define IER(offset) XE_REG(offset + 0xc)
>
>-static void assert_iir_is_zero(struct xe_gt *gt, struct xe_reg reg)
>+static void assert_iir_is_zero(struct xe_gt *mmio, struct xe_reg reg)
> {
>- u32 val = xe_mmio_read32(gt, reg);
>+ u32 val = xe_mmio_read32(mmio, reg);
>
> if (val == 0)
> return;
>
>- drm_WARN(>_to_xe(gt)->drm, 1,
>+ drm_WARN(>_to_xe(mmio)->drm, 1,
> "Interrupt register 0x%x is not zero: 0x%08x\n",
> reg.addr, val);
>- xe_mmio_write32(gt, reg, 0xffffffff);
>- xe_mmio_read32(gt, reg);
>- xe_mmio_write32(gt, reg, 0xffffffff);
>- xe_mmio_read32(gt, reg);
>+ xe_mmio_write32(mmio, reg, 0xffffffff);
>+ xe_mmio_read32(mmio, reg);
>+ xe_mmio_write32(mmio, reg, 0xffffffff);
>+ xe_mmio_read32(mmio, reg);
> }
>
> /*
> * Unmask and enable the specified interrupts. Does not check current state,
> * so any bits not specified here will become masked and disabled.
> */
>-static void unmask_and_enable(struct xe_gt *gt, u32 irqregs, u32 bits)
>+static void unmask_and_enable(struct xe_tile *tile, u32 irqregs, u32 bits)
> {
>+ struct xe_gt *mmio = tile->primary_gt;
>+
> /*
> * If we're just enabling an interrupt now, it shouldn't already
> * be raised in the IIR.
> */
>- assert_iir_is_zero(gt, IIR(irqregs));
>+ assert_iir_is_zero(mmio, IIR(irqregs));
>
>- xe_mmio_write32(gt, IER(irqregs), bits);
>- xe_mmio_write32(gt, IMR(irqregs), ~bits);
>+ xe_mmio_write32(mmio, IER(irqregs), bits);
>+ xe_mmio_write32(mmio, IMR(irqregs), ~bits);
>
> /* Posting read */
>- xe_mmio_read32(gt, IMR(irqregs));
>+ xe_mmio_read32(mmio, IMR(irqregs));
> }
>
> /* Mask and disable all interrupts. */
>-static void mask_and_disable(struct xe_gt *gt, u32 irqregs)
>+static void mask_and_disable(struct xe_tile *tile, u32 irqregs)
> {
>- xe_mmio_write32(gt, IMR(irqregs), ~0);
>+ struct xe_gt *mmio = tile->primary_gt;
>+
>+ xe_mmio_write32(mmio, IMR(irqregs), ~0);
> /* Posting read */
>- xe_mmio_read32(gt, IMR(irqregs));
>+ xe_mmio_read32(mmio, IMR(irqregs));
>
>- xe_mmio_write32(gt, IER(irqregs), 0);
>+ xe_mmio_write32(mmio, IER(irqregs), 0);
>
> /* IIR can theoretically queue up two events. Be paranoid. */
>- xe_mmio_write32(gt, IIR(irqregs), ~0);
>- xe_mmio_read32(gt, IIR(irqregs));
>- xe_mmio_write32(gt, IIR(irqregs), ~0);
>- xe_mmio_read32(gt, IIR(irqregs));
>+ xe_mmio_write32(mmio, IIR(irqregs), ~0);
>+ xe_mmio_read32(mmio, IIR(irqregs));
>+ xe_mmio_write32(mmio, IIR(irqregs), ~0);
>+ xe_mmio_read32(mmio, IIR(irqregs));
> }
>
>-static u32 xelp_intr_disable(struct xe_gt *gt)
>+static u32 xelp_intr_disable(struct xe_device *xe)
> {
>- xe_mmio_write32(gt, GFX_MSTR_IRQ, 0);
>+ struct xe_gt *mmio = xe_root_mmio_gt(xe);
>+
>+ xe_mmio_write32(mmio, GFX_MSTR_IRQ, 0);
>
> /*
> * Now with master disabled, get a sample of level indications
>@@ -88,36 +94,41 @@ static u32 xelp_intr_disable(struct xe_gt *gt)
> * New indications can and will light up during processing,
> * and will generate new interrupt after enabling master.
> */
>- return xe_mmio_read32(gt, GFX_MSTR_IRQ);
>+ return xe_mmio_read32(mmio, GFX_MSTR_IRQ);
> }
>
> static u32
>-gu_misc_irq_ack(struct xe_gt *gt, const u32 master_ctl)
>+gu_misc_irq_ack(struct xe_device *xe, const u32 master_ctl)
> {
>+ struct xe_gt *mmio = xe_root_mmio_gt(xe);
> u32 iir;
>
> if (!(master_ctl & GU_MISC_IRQ))
> return 0;
>
>- iir = xe_mmio_read32(gt, IIR(GU_MISC_IRQ_OFFSET));
>+ iir = xe_mmio_read32(mmio, IIR(GU_MISC_IRQ_OFFSET));
> if (likely(iir))
>- xe_mmio_write32(gt, IIR(GU_MISC_IRQ_OFFSET), iir);
>+ xe_mmio_write32(mmio, IIR(GU_MISC_IRQ_OFFSET), iir);
>
> return iir;
> }
>
>-static inline void xelp_intr_enable(struct xe_gt *gt, bool stall)
>+static inline void xelp_intr_enable(struct xe_device *xe, bool stall)
> {
>- xe_mmio_write32(gt, GFX_MSTR_IRQ, MASTER_IRQ);
>+ struct xe_gt *mmio = xe_root_mmio_gt(xe);
>+
>+ xe_mmio_write32(mmio, GFX_MSTR_IRQ, MASTER_IRQ);
> if (stall)
>- xe_mmio_read32(gt, GFX_MSTR_IRQ);
>+ xe_mmio_read32(mmio, GFX_MSTR_IRQ);
> }
>
>-static void gt_irq_postinstall(struct xe_device *xe, struct xe_gt *gt)
>+static void gt_irq_postinstall(struct xe_tile *tile)
> {
>+ struct xe_device *xe = tile_to_xe(tile);
>+ struct xe_gt *mmio = tile->primary_gt;
> u32 irqs, dmask, smask;
>- u32 ccs_mask = xe_hw_engine_mask_per_class(gt, XE_ENGINE_CLASS_COMPUTE);
>- u32 bcs_mask = xe_hw_engine_mask_per_class(gt, XE_ENGINE_CLASS_COPY);
>+ u32 ccs_mask = xe_hw_engine_mask_per_class(tile->primary_gt, XE_ENGINE_CLASS_COMPUTE);
>+ u32 bcs_mask = xe_hw_engine_mask_per_class(tile->primary_gt, XE_ENGINE_CLASS_COPY);
>
> if (xe_device_guc_submission_enabled(xe)) {
> irqs = GT_RENDER_USER_INTERRUPT |
>@@ -133,57 +144,57 @@ static void gt_irq_postinstall(struct xe_device *xe, struct xe_gt *gt)
> smask = irqs << 16;
>
> /* Enable RCS, BCS, VCS and VECS class interrupts. */
>- xe_mmio_write32(gt, RENDER_COPY_INTR_ENABLE, dmask);
>- xe_mmio_write32(gt, VCS_VECS_INTR_ENABLE, dmask);
>+ xe_mmio_write32(mmio, RENDER_COPY_INTR_ENABLE, dmask);
>+ xe_mmio_write32(mmio, VCS_VECS_INTR_ENABLE, dmask);
> if (ccs_mask)
>- xe_mmio_write32(gt, CCS_RSVD_INTR_ENABLE, smask);
>+ xe_mmio_write32(mmio, CCS_RSVD_INTR_ENABLE, smask);
>
> /* Unmask irqs on RCS, BCS, VCS and VECS engines. */
>- xe_mmio_write32(gt, RCS0_RSVD_INTR_MASK, ~smask);
>- xe_mmio_write32(gt, BCS_RSVD_INTR_MASK, ~smask);
>+ xe_mmio_write32(mmio, RCS0_RSVD_INTR_MASK, ~smask);
>+ xe_mmio_write32(mmio, BCS_RSVD_INTR_MASK, ~smask);
> if (bcs_mask & (BIT(1)|BIT(2)))
>- xe_mmio_write32(gt, XEHPC_BCS1_BCS2_INTR_MASK, ~dmask);
>+ xe_mmio_write32(mmio, XEHPC_BCS1_BCS2_INTR_MASK, ~dmask);
> if (bcs_mask & (BIT(3)|BIT(4)))
>- xe_mmio_write32(gt, XEHPC_BCS3_BCS4_INTR_MASK, ~dmask);
>+ xe_mmio_write32(mmio, XEHPC_BCS3_BCS4_INTR_MASK, ~dmask);
> if (bcs_mask & (BIT(5)|BIT(6)))
>- xe_mmio_write32(gt, XEHPC_BCS5_BCS6_INTR_MASK, ~dmask);
>+ xe_mmio_write32(mmio, XEHPC_BCS5_BCS6_INTR_MASK, ~dmask);
> if (bcs_mask & (BIT(7)|BIT(8)))
>- xe_mmio_write32(gt, XEHPC_BCS7_BCS8_INTR_MASK, ~dmask);
>- xe_mmio_write32(gt, VCS0_VCS1_INTR_MASK, ~dmask);
>- xe_mmio_write32(gt, VCS2_VCS3_INTR_MASK, ~dmask);
>- xe_mmio_write32(gt, VECS0_VECS1_INTR_MASK, ~dmask);
>+ xe_mmio_write32(mmio, XEHPC_BCS7_BCS8_INTR_MASK, ~dmask);
>+ xe_mmio_write32(mmio, VCS0_VCS1_INTR_MASK, ~dmask);
>+ xe_mmio_write32(mmio, VCS2_VCS3_INTR_MASK, ~dmask);
>+ xe_mmio_write32(mmio, VECS0_VECS1_INTR_MASK, ~dmask);
> if (ccs_mask & (BIT(0)|BIT(1)))
>- xe_mmio_write32(gt, CCS0_CCS1_INTR_MASK, ~dmask);
>+ xe_mmio_write32(mmio, CCS0_CCS1_INTR_MASK, ~dmask);
> if (ccs_mask & (BIT(2)|BIT(3)))
>- xe_mmio_write32(gt, CCS2_CCS3_INTR_MASK, ~dmask);
>+ xe_mmio_write32(mmio, CCS2_CCS3_INTR_MASK, ~dmask);
>
> /*
> * RPS interrupts will get enabled/disabled on demand when RPS itself
> * is enabled/disabled.
> */
> /* TODO: gt->pm_ier, gt->pm_imr */
>- xe_mmio_write32(gt, GPM_WGBOXPERF_INTR_ENABLE, 0);
>- xe_mmio_write32(gt, GPM_WGBOXPERF_INTR_MASK, ~0);
>+ xe_mmio_write32(mmio, GPM_WGBOXPERF_INTR_ENABLE, 0);
>+ xe_mmio_write32(mmio, GPM_WGBOXPERF_INTR_MASK, ~0);
>
> /* Same thing for GuC interrupts */
>- xe_mmio_write32(gt, GUC_SG_INTR_ENABLE, 0);
>- xe_mmio_write32(gt, GUC_SG_INTR_MASK, ~0);
>+ xe_mmio_write32(mmio, GUC_SG_INTR_ENABLE, 0);
>+ xe_mmio_write32(mmio, GUC_SG_INTR_MASK, ~0);
> }
>
>-static void xelp_irq_postinstall(struct xe_device *xe, struct xe_gt *gt)
>+static void xelp_irq_postinstall(struct xe_device *xe, struct xe_tile *tile)
> {
> /* TODO: PCH */
>
>- gt_irq_postinstall(xe, gt);
>+ gt_irq_postinstall(tile);
>
>- unmask_and_enable(gt, GU_MISC_IRQ_OFFSET, GU_MISC_GSE);
>+ unmask_and_enable(tile, GU_MISC_IRQ_OFFSET, GU_MISC_GSE);
>
>- xelp_intr_enable(gt, true);
>+ xelp_intr_enable(xe, true);
> }
>
> static u32
> gt_engine_identity(struct xe_device *xe,
>- struct xe_gt *gt,
>+ struct xe_gt *mmio,
> const unsigned int bank,
> const unsigned int bit)
> {
>@@ -192,7 +203,7 @@ gt_engine_identity(struct xe_device *xe,
>
> lockdep_assert_held(&xe->irq.lock);
>
>- xe_mmio_write32(gt, IIR_REG_SELECTOR(bank), BIT(bit));
>+ xe_mmio_write32(mmio, IIR_REG_SELECTOR(bank), BIT(bit));
>
> /*
> * NB: Specs do not specify how long to spin wait,
>@@ -200,7 +211,7 @@ gt_engine_identity(struct xe_device *xe,
> */
> timeout_ts = (local_clock() >> 10) + 100;
> do {
>- ident = xe_mmio_read32(gt, INTR_IDENTITY_REG(bank));
>+ ident = xe_mmio_read32(mmio, INTR_IDENTITY_REG(bank));
> } while (!(ident & INTR_DATA_VALID) &&
> !time_after32(local_clock() >> 10, timeout_ts));
>
>@@ -210,7 +221,7 @@ gt_engine_identity(struct xe_device *xe,
> return 0;
> }
>
>- xe_mmio_write32(gt, INTR_IDENTITY_REG(bank), INTR_DATA_VALID);
>+ xe_mmio_write32(mmio, INTR_IDENTITY_REG(bank), INTR_DATA_VALID);
>
> return ident;
> }
>@@ -232,10 +243,32 @@ gt_other_irq_handler(struct xe_gt *gt, const u8 instance, const u16 iir)
> }
> }
>
>-static void gt_irq_handler(struct xe_device *xe, struct xe_gt *gt,
>+static struct xe_gt *pick_engine_gt(struct xe_tile *tile,
>+ enum xe_engine_class class,
>+ unsigned int instance)
>+{
>+ struct xe_device *xe = tile_to_xe(tile);
>+
>+ if (MEDIA_VER(xe) < 13)
>+ return tile->primary_gt;
>+
>+ if (class == XE_ENGINE_CLASS_VIDEO_DECODE ||
>+ class == XE_ENGINE_CLASS_VIDEO_ENHANCE)
>+ return tile->media_gt;
>+
>+ if (class == XE_ENGINE_CLASS_OTHER &&
>+ instance == OTHER_MEDIA_GUC_INSTANCE)
>+ return tile->media_gt;
>+
>+ return tile->primary_gt;
>+}
>+
>+static void gt_irq_handler(struct xe_tile *tile,
> u32 master_ctl, long unsigned int *intr_dw,
> u32 *identity)
> {
>+ struct xe_device *xe = tile_to_xe(tile);
>+ struct xe_gt *mmio = tile->primary_gt;
> unsigned int bank, bit;
> u16 instance, intr_vec;
> enum xe_engine_class class;
>@@ -247,27 +280,26 @@ static void gt_irq_handler(struct xe_device *xe, struct xe_gt *gt,
> if (!(master_ctl & GT_DW_IRQ(bank)))
> continue;
>
>- if (!xe_gt_is_media_type(gt)) {
>- intr_dw[bank] =
>- xe_mmio_read32(gt, GT_INTR_DW(bank));
>- for_each_set_bit(bit, intr_dw + bank, 32)
>- identity[bit] = gt_engine_identity(xe, gt,
>- bank, bit);
>- xe_mmio_write32(gt, GT_INTR_DW(bank),
>- intr_dw[bank]);
>- }
>+ intr_dw[bank] = xe_mmio_read32(mmio, GT_INTR_DW(bank));
>+ for_each_set_bit(bit, intr_dw + bank, 32)
>+ identity[bit] = gt_engine_identity(xe, mmio, bank, bit);
>+ xe_mmio_write32(mmio, GT_INTR_DW(bank), intr_dw[bank]);
>
> for_each_set_bit(bit, intr_dw + bank, 32) {
>+ struct xe_gt *engine_gt;
>+
> class = INTR_ENGINE_CLASS(identity[bit]);
> instance = INTR_ENGINE_INSTANCE(identity[bit]);
> intr_vec = INTR_ENGINE_INTR(identity[bit]);
>
>+ engine_gt = pick_engine_gt(tile, class, instance);
>+
> if (class == XE_ENGINE_CLASS_OTHER) {
>- gt_other_irq_handler(gt, instance, intr_vec);
>+ gt_other_irq_handler(engine_gt, instance, intr_vec);
> continue;
> }
>
>- hwe = xe_gt_hw_engine(gt, class, instance, false);
>+ hwe = xe_gt_hw_engine(engine_gt, class, instance, false);
> if (!hwe)
> continue;
>
>@@ -285,24 +317,24 @@ static void gt_irq_handler(struct xe_device *xe, struct xe_gt *gt,
> static irqreturn_t xelp_irq_handler(int irq, void *arg)
> {
> struct xe_device *xe = arg;
>- struct xe_gt *gt = xe_root_mmio_gt(xe);
>+ struct xe_tile *tile = xe_device_get_root_tile(xe);
> u32 master_ctl, gu_misc_iir;
> long unsigned int intr_dw[2];
> u32 identity[32];
>
>- master_ctl = xelp_intr_disable(gt);
>+ master_ctl = xelp_intr_disable(xe);
> if (!master_ctl) {
>- xelp_intr_enable(gt, false);
>+ xelp_intr_enable(xe, false);
> return IRQ_NONE;
> }
>
>- gt_irq_handler(xe, gt, master_ctl, intr_dw, identity);
>+ gt_irq_handler(tile, master_ctl, intr_dw, identity);
>
> xe_display_irq_handler(xe, master_ctl);
>
>- gu_misc_iir = gu_misc_irq_ack(gt, master_ctl);
>+ gu_misc_iir = gu_misc_irq_ack(xe, master_ctl);
>
>- xelp_intr_enable(gt, false);
>+ xelp_intr_enable(xe, false);
>
> xe_display_irq_enable(xe, gu_misc_iir);
>
>@@ -311,38 +343,38 @@ static irqreturn_t xelp_irq_handler(int irq, void *arg)
>
> static u32 dg1_intr_disable(struct xe_device *xe)
> {
>- struct xe_gt *gt = xe_root_mmio_gt(xe);
>+ struct xe_gt *mmio = xe_root_mmio_gt(xe);
> u32 val;
>
> /* First disable interrupts */
>- xe_mmio_write32(gt, DG1_MSTR_TILE_INTR, 0);
>+ xe_mmio_write32(mmio, DG1_MSTR_TILE_INTR, 0);
>
> /* Get the indication levels and ack the master unit */
>- val = xe_mmio_read32(gt, DG1_MSTR_TILE_INTR);
>+ val = xe_mmio_read32(mmio, DG1_MSTR_TILE_INTR);
> if (unlikely(!val))
> return 0;
>
>- xe_mmio_write32(gt, DG1_MSTR_TILE_INTR, val);
>+ xe_mmio_write32(mmio, DG1_MSTR_TILE_INTR, val);
>
> return val;
> }
>
> static void dg1_intr_enable(struct xe_device *xe, bool stall)
> {
>- struct xe_gt *gt = xe_root_mmio_gt(xe);
>+ struct xe_gt *mmio = xe_root_mmio_gt(xe);
>
>- xe_mmio_write32(gt, DG1_MSTR_TILE_INTR, DG1_MSTR_IRQ);
>+ xe_mmio_write32(mmio, DG1_MSTR_TILE_INTR, DG1_MSTR_IRQ);
> if (stall)
>- xe_mmio_read32(gt, DG1_MSTR_TILE_INTR);
>+ xe_mmio_read32(mmio, DG1_MSTR_TILE_INTR);
> }
>
>-static void dg1_irq_postinstall(struct xe_device *xe, struct xe_gt *gt)
>+static void dg1_irq_postinstall(struct xe_device *xe, struct xe_tile *tile)
> {
>- gt_irq_postinstall(xe, gt);
>+ gt_irq_postinstall(tile);
>
>- unmask_and_enable(gt, GU_MISC_IRQ_OFFSET, GU_MISC_GSE);
>+ unmask_and_enable(tile, GU_MISC_IRQ_OFFSET, GU_MISC_GSE);
>
>- if (gt->info.id == XE_GT0)
>+ if (tile->id == 0)
> dg1_intr_enable(xe, true);
> }
>
>@@ -354,8 +386,8 @@ static void dg1_irq_postinstall(struct xe_device *xe, struct xe_gt *gt)
> static irqreturn_t dg1_irq_handler(int irq, void *arg)
> {
> struct xe_device *xe = arg;
>- struct xe_gt *gt;
>- u32 master_tile_ctl, master_ctl = 0, tile0_master_ctl = 0, gu_misc_iir;
>+ struct xe_tile *tile;
>+ u32 master_tile_ctl, master_ctl = 0, gu_misc_iir = 0;
> long unsigned int intr_dw[2];
> u32 identity[32];
> u8 id;
>@@ -368,12 +400,13 @@ static irqreturn_t dg1_irq_handler(int irq, void *arg)
> return IRQ_NONE;
> }
>
>- for_each_gt(gt, xe, id) {
>- if ((master_tile_ctl & DG1_MSTR_TILE(gt_to_tile(gt)->id)) == 0)
>+ for_each_tile(tile, xe, id) {
>+ struct xe_gt *mmio = tile->primary_gt;
>+
>+ if ((master_tile_ctl & DG1_MSTR_TILE(tile->id)) == 0)
> continue;
>
>- if (!xe_gt_is_media_type(gt))
>- master_ctl = xe_mmio_read32(gt, GFX_MSTR_IRQ);
>+ master_ctl = xe_mmio_read32(mmio, GFX_MSTR_IRQ);
>
> /*
> * We might be in irq handler just when PCIe DPC is initiated
>@@ -381,124 +414,125 @@ static irqreturn_t dg1_irq_handler(int irq, void *arg)
> * irq as device is inaccessible.
> */
> if (master_ctl == REG_GENMASK(31, 0)) {
>- dev_dbg(gt_to_xe(gt)->drm.dev,
>+ dev_dbg(tile_to_xe(tile)->drm.dev,
> "Ignore this IRQ as device might be in DPC containment.\n");
> return IRQ_HANDLED;
> }
>
>- if (!xe_gt_is_media_type(gt))
>- xe_mmio_write32(gt, GFX_MSTR_IRQ, master_ctl);
>- gt_irq_handler(xe, gt, master_ctl, intr_dw, identity);
>+ xe_mmio_write32(mmio, GFX_MSTR_IRQ, master_ctl);
>+
>+ gt_irq_handler(tile, master_ctl, intr_dw, identity);
>
> /*
>- * Save primary tile's master interrupt register for display
>- * processing below.
>+ * Display interrupts (including display backlight operations
>+ * that get reported as Gunit GSE) would only be hooked up to
>+ * the primary tile.
> */
>- if (id == 0)
>- tile0_master_ctl = master_ctl;
>+ if (id == 0) {
>+ xe_display_irq_handler(xe, master_ctl);
>+ gu_misc_iir = gu_misc_irq_ack(xe, master_ctl);
>+ }
> }
>
>- xe_display_irq_handler(xe, tile0_master_ctl);
>-
>- /* Gunit GSE interrupts can trigger display backlight operations */
>- gu_misc_iir = gu_misc_irq_ack(gt, tile0_master_ctl);
>-
> dg1_intr_enable(xe, false);
>-
> xe_display_irq_enable(xe, gu_misc_iir);
>
> return IRQ_HANDLED;
> }
>
>-static void gt_irq_reset(struct xe_gt *gt)
>+static void gt_irq_reset(struct xe_tile *tile)
> {
>- u32 ccs_mask = xe_hw_engine_mask_per_class(gt, XE_ENGINE_CLASS_COMPUTE);
>- u32 bcs_mask = xe_hw_engine_mask_per_class(gt, XE_ENGINE_CLASS_COPY);
>+ struct xe_gt *mmio = tile->primary_gt;
>+
>+ u32 ccs_mask = xe_hw_engine_mask_per_class(tile->primary_gt,
>+ XE_ENGINE_CLASS_COMPUTE);
>+ u32 bcs_mask = xe_hw_engine_mask_per_class(tile->primary_gt,
>+ XE_ENGINE_CLASS_COPY);
>
> /* Disable RCS, BCS, VCS and VECS class engines. */
>- xe_mmio_write32(gt, RENDER_COPY_INTR_ENABLE, 0);
>- xe_mmio_write32(gt, VCS_VECS_INTR_ENABLE, 0);
>+ xe_mmio_write32(mmio, RENDER_COPY_INTR_ENABLE, 0);
>+ xe_mmio_write32(mmio, VCS_VECS_INTR_ENABLE, 0);
> if (ccs_mask)
>- xe_mmio_write32(gt, CCS_RSVD_INTR_ENABLE, 0);
>+ xe_mmio_write32(mmio, CCS_RSVD_INTR_ENABLE, 0);
>
> /* Restore masks irqs on RCS, BCS, VCS and VECS engines. */
>- xe_mmio_write32(gt, RCS0_RSVD_INTR_MASK, ~0);
>- xe_mmio_write32(gt, BCS_RSVD_INTR_MASK, ~0);
>+ xe_mmio_write32(mmio, RCS0_RSVD_INTR_MASK, ~0);
>+ xe_mmio_write32(mmio, BCS_RSVD_INTR_MASK, ~0);
> if (bcs_mask & (BIT(1)|BIT(2)))
>- xe_mmio_write32(gt, XEHPC_BCS1_BCS2_INTR_MASK, ~0);
>+ xe_mmio_write32(mmio, XEHPC_BCS1_BCS2_INTR_MASK, ~0);
> if (bcs_mask & (BIT(3)|BIT(4)))
>- xe_mmio_write32(gt, XEHPC_BCS3_BCS4_INTR_MASK, ~0);
>+ xe_mmio_write32(mmio, XEHPC_BCS3_BCS4_INTR_MASK, ~0);
> if (bcs_mask & (BIT(5)|BIT(6)))
>- xe_mmio_write32(gt, XEHPC_BCS5_BCS6_INTR_MASK, ~0);
>+ xe_mmio_write32(mmio, XEHPC_BCS5_BCS6_INTR_MASK, ~0);
> if (bcs_mask & (BIT(7)|BIT(8)))
>- xe_mmio_write32(gt, XEHPC_BCS7_BCS8_INTR_MASK, ~0);
>- xe_mmio_write32(gt, VCS0_VCS1_INTR_MASK, ~0);
>- xe_mmio_write32(gt, VCS2_VCS3_INTR_MASK, ~0);
>- xe_mmio_write32(gt, VECS0_VECS1_INTR_MASK, ~0);
>+ xe_mmio_write32(mmio, XEHPC_BCS7_BCS8_INTR_MASK, ~0);
>+ xe_mmio_write32(mmio, VCS0_VCS1_INTR_MASK, ~0);
>+ xe_mmio_write32(mmio, VCS2_VCS3_INTR_MASK, ~0);
>+ xe_mmio_write32(mmio, VECS0_VECS1_INTR_MASK, ~0);
> if (ccs_mask & (BIT(0)|BIT(1)))
>- xe_mmio_write32(gt, CCS0_CCS1_INTR_MASK, ~0);
>+ xe_mmio_write32(mmio, CCS0_CCS1_INTR_MASK, ~0);
> if (ccs_mask & (BIT(2)|BIT(3)))
>- xe_mmio_write32(gt, CCS2_CCS3_INTR_MASK, ~0);
>+ xe_mmio_write32(mmio, CCS2_CCS3_INTR_MASK, ~0);
>
>- xe_mmio_write32(gt, GPM_WGBOXPERF_INTR_ENABLE, 0);
>- xe_mmio_write32(gt, GPM_WGBOXPERF_INTR_MASK, ~0);
>- xe_mmio_write32(gt, GUC_SG_INTR_ENABLE, 0);
>- xe_mmio_write32(gt, GUC_SG_INTR_MASK, ~0);
>+ xe_mmio_write32(mmio, GPM_WGBOXPERF_INTR_ENABLE, 0);
>+ xe_mmio_write32(mmio, GPM_WGBOXPERF_INTR_MASK, ~0);
>+ xe_mmio_write32(mmio, GUC_SG_INTR_ENABLE, 0);
>+ xe_mmio_write32(mmio, GUC_SG_INTR_MASK, ~0);
> }
>
>-static void xelp_irq_reset(struct xe_gt *gt)
>+static void xelp_irq_reset(struct xe_tile *tile)
> {
>- xelp_intr_disable(gt);
>+ xelp_intr_disable(tile_to_xe(tile));
>
>- gt_irq_reset(gt);
>+ gt_irq_reset(tile);
>
>- mask_and_disable(gt, GU_MISC_IRQ_OFFSET);
>- mask_and_disable(gt, PCU_IRQ_OFFSET);
>+ mask_and_disable(tile, GU_MISC_IRQ_OFFSET);
>+ mask_and_disable(tile, PCU_IRQ_OFFSET);
> }
>
>-static void dg1_irq_reset(struct xe_gt *gt)
>+static void dg1_irq_reset(struct xe_tile *tile)
> {
>- if (gt->info.id == 0)
>- dg1_intr_disable(gt_to_xe(gt));
>+ if (tile->id == 0)
>+ dg1_intr_disable(tile_to_xe(tile));
>
>- gt_irq_reset(gt);
>+ gt_irq_reset(tile);
>
>- mask_and_disable(gt, GU_MISC_IRQ_OFFSET);
>- mask_and_disable(gt, PCU_IRQ_OFFSET);
>+ mask_and_disable(tile, GU_MISC_IRQ_OFFSET);
>+ mask_and_disable(tile, PCU_IRQ_OFFSET);
> }
>
> static void xe_irq_reset(struct xe_device *xe)
> {
>- struct xe_gt *gt;
>+ struct xe_tile *tile;
> u8 id;
>
>- for_each_gt(gt, xe, id) {
>+ for_each_tile(tile, xe, id) {
> if (GRAPHICS_VERx100(xe) >= 1210)
>- dg1_irq_reset(gt);
>+ dg1_irq_reset(tile);
> else
>- xelp_irq_reset(gt);
>+ xelp_irq_reset(tile);
> }
>
> xe_display_irq_reset(xe);
> }
>
>-void xe_gt_irq_postinstall(struct xe_gt *gt)
>+void xe_gt_irq_postinstall(struct xe_tile *tile)
> {
>- struct xe_device *xe = gt_to_xe(gt);
>+ struct xe_device *xe = tile_to_xe(tile);
>
> if (GRAPHICS_VERx100(xe) >= 1210)
>- dg1_irq_postinstall(xe, gt);
>+ dg1_irq_postinstall(xe, tile);
> else
>- xelp_irq_postinstall(xe, gt);
>+ xelp_irq_postinstall(xe, tile);
> }
>
> static void xe_irq_postinstall(struct xe_device *xe)
> {
>- struct xe_gt *gt;
>+ struct xe_tile *tile;
> u8 id;
>
>- for_each_gt(gt, xe, id)
>- xe_gt_irq_postinstall(gt);
>+ for_each_tile(tile, xe, id)
>+ xe_gt_irq_postinstall(tile);
>
> xe_display_irq_postinstall(xe, xe_root_mmio_gt(xe));
> }
>diff --git a/drivers/gpu/drm/xe/xe_irq.h b/drivers/gpu/drm/xe/xe_irq.h
>index 34ecf22b32d3..69113c21e1cd 100644
>--- a/drivers/gpu/drm/xe/xe_irq.h
>+++ b/drivers/gpu/drm/xe/xe_irq.h
>@@ -7,10 +7,10 @@
> #define _XE_IRQ_H_
>
> struct xe_device;
>-struct xe_gt;
>+struct xe_tile;
>
> int xe_irq_install(struct xe_device *xe);
>-void xe_gt_irq_postinstall(struct xe_gt *gt);
>+void xe_gt_irq_postinstall(struct xe_tile *tile);
> void xe_irq_shutdown(struct xe_device *xe);
> void xe_irq_suspend(struct xe_device *xe);
> void xe_irq_resume(struct xe_device *xe);
>--
>2.40.0
>
More information about the Intel-xe
mailing list