drm/i915/gt: Tidy repetition in declaring gen8+ interrupts

We use the same interrupt mask for each engine, so define it once in a
local and reuse.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200127231540.3302516-3-chris@chris-wilson.co.uk

diff --git a/drivers/gpu/drm/i915/gt/intel_gt_irq.c b/drivers/gpu/drm/i915/gt/intel_gt_irq.c
index 71873a4cafc0e1adc92427ae739b27ca893e16e9..7278b10e1a038a0492ad3cf798ca3e99329ba334 100644 (file)
--- a/drivers/gpu/drm/i915/gt/intel_gt_irq.c
+++ b/drivers/gpu/drm/i915/gt/intel_gt_irq.c
@@ -344,25 +344,15 @@ void gen8_gt_irq_reset(struct intel_gt *gt)
 
 void gen8_gt_irq_postinstall(struct intel_gt *gt)
 {
-       struct intel_uncore *uncore = gt->uncore;
-
        /* These are interrupts we'll toggle with the ring mask register */
-       u32 gt_interrupts[] = {
-               (GT_RENDER_USER_INTERRUPT << GEN8_RCS_IRQ_SHIFT |
-                GT_CONTEXT_SWITCH_INTERRUPT << GEN8_RCS_IRQ_SHIFT |
-                GT_RENDER_USER_INTERRUPT << GEN8_BCS_IRQ_SHIFT |
-                GT_CONTEXT_SWITCH_INTERRUPT << GEN8_BCS_IRQ_SHIFT),
-
-               (GT_RENDER_USER_INTERRUPT << GEN8_VCS0_IRQ_SHIFT |
-                GT_CONTEXT_SWITCH_INTERRUPT << GEN8_VCS0_IRQ_SHIFT |
-                GT_RENDER_USER_INTERRUPT << GEN8_VCS1_IRQ_SHIFT |
-                GT_CONTEXT_SWITCH_INTERRUPT << GEN8_VCS1_IRQ_SHIFT),
-
+       const u32 irqs = GT_RENDER_USER_INTERRUPT | GT_CONTEXT_SWITCH_INTERRUPT;
+       const u32 gt_interrupts[] = {
+               irqs << GEN8_RCS_IRQ_SHIFT | irqs << GEN8_BCS_IRQ_SHIFT,
+               irqs << GEN8_VCS0_IRQ_SHIFT | irqs << GEN8_VCS1_IRQ_SHIFT,
                0,
-
-               (GT_RENDER_USER_INTERRUPT << GEN8_VECS_IRQ_SHIFT |
-                GT_CONTEXT_SWITCH_INTERRUPT << GEN8_VECS_IRQ_SHIFT)
+               irqs << GEN8_VECS_IRQ_SHIFT,
        };
+       struct intel_uncore *uncore = gt->uncore;
 
        gt->pm_ier = 0x0;
        gt->pm_imr = ~gt->pm_ier;