]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/xe/irq: Handle msix vector0 interrupt
authorVenkata Ramana Nayana <venkata.ramana.nayana@intel.com>
Fri, 7 Nov 2025 08:31:41 +0000 (14:01 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 1 Dec 2025 10:45:57 +0000 (11:45 +0100)
[ Upstream commit 5b38c22687d9287d85dd3bef2fa708bf62cf3895 ]

Current gu2host handler registered as MSI-X vector 0 and as per bspec for
a msix vector 0 interrupt, the driver must check the legacy registers
190008(TILE_INT_REG), 190060h (GT INTR Identity Reg 0) and other registers
mentioned in "Interrupt Service Routine Pseudocode" otherwise it will block
the next interrupts. To overcome this issue replacing guc2host handler
with legacy xe_irq_handler.

Fixes: da889070be7b2 ("drm/xe/irq: Separate MSI and MSI-X flows")
Bspec: 62357
Signed-off-by: Venkata Ramana Nayana <venkata.ramana.nayana@intel.com>
Reviewed-by: Balasubramani Vivekanandan <balasubramani.vivekanandan@intel.com>
Link: https://patch.msgid.link/20251107083141.2080189-1-venkata.ramana.nayana@intel.com
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
(cherry picked from commit c34a14bce7090862ebe5a64abe8d85df75e62737)
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpu/drm/xe/xe_irq.c

index 5df5b8c2a3e4df74e17ff78f325ca37b8db72dae..da22f083e86a7fe1a50567a260dd932948499950 100644 (file)
@@ -843,22 +843,6 @@ static int xe_irq_msix_init(struct xe_device *xe)
        return 0;
 }
 
-static irqreturn_t guc2host_irq_handler(int irq, void *arg)
-{
-       struct xe_device *xe = arg;
-       struct xe_tile *tile;
-       u8 id;
-
-       if (!atomic_read(&xe->irq.enabled))
-               return IRQ_NONE;
-
-       for_each_tile(tile, xe, id)
-               xe_guc_irq_handler(&tile->primary_gt->uc.guc,
-                                  GUC_INTR_GUC2HOST);
-
-       return IRQ_HANDLED;
-}
-
 static irqreturn_t xe_irq_msix_default_hwe_handler(int irq, void *arg)
 {
        unsigned int tile_id, gt_id;
@@ -975,7 +959,7 @@ int xe_irq_msix_request_irqs(struct xe_device *xe)
        u16 msix;
 
        msix = GUC2HOST_MSIX;
-       err = xe_irq_msix_request_irq(xe, guc2host_irq_handler, xe,
+       err = xe_irq_msix_request_irq(xe, xe_irq_handler(xe), xe,
                                      DRIVER_NAME "-guc2host", false, &msix);
        if (err)
                return err;