]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/i915/icl: No need to ack intr through master control
authorMika Kuoppala <mika.kuoppala@linux.intel.com>
Mon, 15 Oct 2018 14:14:39 +0000 (17:14 +0300)
committerMika Kuoppala <mika.kuoppala@linux.intel.com>
Tue, 16 Oct 2018 10:11:23 +0000 (13:11 +0300)
All other master control register bits, except the enable,
are read only and they are level indications of the second
level interrupt status. Only touch enable bit and rectify
the comment.

Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Signed-off-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181015141440.21845-2-mika.kuoppala@linux.intel.com
drivers/gpu/drm/i915/i915_irq.c

index cbc04dd59041dc5ff1cbaf243a6b346f8eb29a9a..e0310ebd9c8ddfaf531816b71d0b0c7b7a45e18a 100644 (file)
@@ -3165,8 +3165,8 @@ static irqreturn_t gen11_irq_handler(int irq, void *arg)
 
        gu_misc_iir = gen11_gu_misc_irq_ack(i915, master_ctl);
 
-       /* Acknowledge and enable interrupts. */
-       raw_reg_write(regs, GEN11_GFX_MSTR_IRQ, GEN11_MASTER_IRQ | master_ctl);
+       /* Enable interrupts. */
+       raw_reg_write(regs, GEN11_GFX_MSTR_IRQ, GEN11_MASTER_IRQ);
 
        gen11_gu_misc_irq_handler(i915, gu_misc_iir);