Merge drm/drm-next into drm-intel-next

[linux-block.git] / drivers / gpu / drm / i915 / i915_irq.c

diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index c2de0ae2d347f98bceed1dfc2a0157fa6dd2679a..82fbabcdd7a594f97d4c8a3526ca5b67979610cf 100644 (file)
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -738,12 +738,15 @@ static void gen11_irq_reset(struct drm_i915_private *dev_priv)
 
 static void dg1_irq_reset(struct drm_i915_private *dev_priv)
 {
-       struct intel_gt *gt = to_gt(dev_priv);
-       struct intel_uncore *uncore = gt->uncore;
+       struct intel_uncore *uncore = &dev_priv->uncore;
+       struct intel_gt *gt;
+       unsigned int i;
 
        dg1_master_intr_disable(dev_priv->uncore.regs);
 
-       gen11_gt_irq_reset(gt);
+       for_each_gt(gt, dev_priv, i)
+               gen11_gt_irq_reset(gt);
+
        gen11_display_irq_reset(dev_priv);
 
        GEN3_IRQ_RESET(uncore, GEN11_GU_MISC_);
@@ -856,11 +859,13 @@ static void gen11_irq_postinstall(struct drm_i915_private *dev_priv)
 
 static void dg1_irq_postinstall(struct drm_i915_private *dev_priv)
 {
-       struct intel_gt *gt = to_gt(dev_priv);
-       struct intel_uncore *uncore = gt->uncore;
+       struct intel_uncore *uncore = &dev_priv->uncore;
        u32 gu_misc_masked = GEN11_GU_MISC_GSE;
+       struct intel_gt *gt;
+       unsigned int i;
 
-       gen11_gt_irq_postinstall(gt);
+       for_each_gt(gt, dev_priv, i)
+               gen11_gt_irq_postinstall(gt);
 
        GEN3_IRQ_INIT(uncore, GEN11_GU_MISC_, ~gu_misc_masked, gu_misc_masked);