drm/i915: Pass drm_i915_private struct instead of gt for gen11_gu_misc_irq_handler...

gen11_gu_misc_irq_handler() and gen11_gu_misc_ack() do nothing tile
specific.

v2: gen11_gu_misc_irq_ack() tile agnostic like gen11_gu_misc_irq_handler()
(Tvrtko)

Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220721225100.693589-1-anusha.srivatsa@intel.com

diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 73cebc6aa65072040408a7291b335451e1956873..eb37b6bacaac332c3b8314b8a9d0cc894c60abdf 100644 (file)
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -2653,9 +2653,9 @@ static irqreturn_t gen8_irq_handler(int irq, void *arg)
 }
 
 static u32
-gen11_gu_misc_irq_ack(struct intel_gt *gt, const u32 master_ctl)
+gen11_gu_misc_irq_ack(struct drm_i915_private *i915, const u32 master_ctl)
 {
-       void __iomem * const regs = gt->uncore->regs;
+       void __iomem * const regs = i915->uncore.regs;
        u32 iir;
 
        if (!(master_ctl & GEN11_GU_MISC_IRQ))
@@ -2669,10 +2669,10 @@ gen11_gu_misc_irq_ack(struct intel_gt *gt, const u32 master_ctl)
 }
 
 static void
-gen11_gu_misc_irq_handler(struct intel_gt *gt, const u32 iir)
+gen11_gu_misc_irq_handler(struct drm_i915_private *i915, const u32 iir)
 {
        if (iir & GEN11_GU_MISC_GSE)
-               intel_opregion_asle_intr(gt->i915);
+               intel_opregion_asle_intr(i915);
 }
 
 static inline u32 gen11_master_intr_disable(void __iomem * const regs)
@@ -2736,11 +2736,11 @@ static irqreturn_t gen11_irq_handler(int irq, void *arg)
        if (master_ctl & GEN11_DISPLAY_IRQ)
                gen11_display_irq_handler(i915);
 
-       gu_misc_iir = gen11_gu_misc_irq_ack(gt, master_ctl);
+       gu_misc_iir = gen11_gu_misc_irq_ack(i915, master_ctl);
 
        gen11_master_intr_enable(regs);
 
-       gen11_gu_misc_irq_handler(gt, gu_misc_iir);
+       gen11_gu_misc_irq_handler(i915, gu_misc_iir);
 
        pmu_irq_stats(i915, IRQ_HANDLED);
 
@@ -2801,11 +2801,11 @@ static irqreturn_t dg1_irq_handler(int irq, void *arg)
        if (master_ctl & GEN11_DISPLAY_IRQ)
                gen11_display_irq_handler(i915);
 
-       gu_misc_iir = gen11_gu_misc_irq_ack(gt, master_ctl);
+       gu_misc_iir = gen11_gu_misc_irq_ack(i915, master_ctl);
 
        dg1_master_intr_enable(regs);
 
-       gen11_gu_misc_irq_handler(gt, gu_misc_iir);
+       gen11_gu_misc_irq_handler(i915, gu_misc_iir);
 
        pmu_irq_stats(i915, IRQ_HANDLED);