drm/i915: also use GEN5_IRQ_INIT with south display interrupts

This interrupt gets initialized with a different IER value, so it was
not using the macro. The problem is that we plan to modify the macro
to make it do additional things, and we want the SDE interrupts
updated too. So let's make sure we call the macro, then, after it, we
do the necessary SDE-specific changes.

Reviewed-by: Ben Widawsky <ben@bwidawsk.net>
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index f487068e8f5a2ecdfda6d9956367f879b2f99288..af1d43c81348a64ed65497afcb2bfe98e11927ee 100644 (file)
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -2827,8 +2827,7 @@ static void ibx_irq_preinstall(struct drm_device *dev)
        if (HAS_PCH_NOP(dev))
                return;
 
-       /* south display irq */
-       I915_WRITE(SDEIMR, 0xffffffff);
+       GEN5_IRQ_INIT(SDE);
        /*
         * SDEIER is also touched by the interrupt handler to work around missed
         * PCH interrupts. Hence we can't update it after the interrupt handler