drm/i915: vlv: factor out valleyview_display_irq_install

We'll need to disable/re-enable the display-side IRQs when turning
off/on the VLV display power well. Factor out the helper functions
for this. For now keep the display IRQs enabled by default, so the
functionality doesn't change. This will be changed to enable/disable
the IRQs on-demand when adding support for VLV power wells in an
upcoming patch.

v2:
- take the irq spin lock for the whole enable/disable sequence as
  these can be called with interrupts enabled

Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 100 insertions, 16 deletions

diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 4a19306b2d73..d6f827ab8f01 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -3025,36 +3025,113 @@ static int ironlake_irq_postinstall(struct drm_device *dev)
         return 0;
 }
 
+static void valleyview_display_irqs_install(struct drm_i915_private *dev_priv)
+{
+        u32 pipestat_mask;
+        u32 iir_mask;
+
+        pipestat_mask = PIPESTAT_INT_STATUS_MASK |
+                        PIPE_FIFO_UNDERRUN_STATUS;
+
+        I915_WRITE(PIPESTAT(PIPE_A), pipestat_mask);
+        I915_WRITE(PIPESTAT(PIPE_B), pipestat_mask);
+        POSTING_READ(PIPESTAT(PIPE_A));
+
+        pipestat_mask = PLANE_FLIP_DONE_INT_STATUS_VLV |
+                        PIPE_CRC_DONE_INTERRUPT_STATUS;
+
+        i915_enable_pipestat(dev_priv, PIPE_A, pipestat_mask |
+                                               PIPE_GMBUS_INTERRUPT_STATUS);
+        i915_enable_pipestat(dev_priv, PIPE_B, pipestat_mask);
+
+        iir_mask = I915_DISPLAY_PORT_INTERRUPT |
+                   I915_DISPLAY_PIPE_A_EVENT_INTERRUPT |
+                   I915_DISPLAY_PIPE_B_EVENT_INTERRUPT;
+        dev_priv->irq_mask &= ~iir_mask;
+
+        I915_WRITE(VLV_IIR, iir_mask);
+        I915_WRITE(VLV_IIR, iir_mask);
+        I915_WRITE(VLV_IMR, dev_priv->irq_mask);
+        I915_WRITE(VLV_IER, ~dev_priv->irq_mask);
+        POSTING_READ(VLV_IER);
+}
+
+static void valleyview_display_irqs_uninstall(struct drm_i915_private *dev_priv)
+{
+        u32 pipestat_mask;
+        u32 iir_mask;
+
+        iir_mask = I915_DISPLAY_PORT_INTERRUPT |
+                   I915_DISPLAY_PIPE_A_EVENT_INTERRUPT |
+                   I915_DISPLAY_PIPE_A_EVENT_INTERRUPT;
+
+        dev_priv->irq_mask |= iir_mask;
+        I915_WRITE(VLV_IER, ~dev_priv->irq_mask);
+        I915_WRITE(VLV_IMR, dev_priv->irq_mask);
+        I915_WRITE(VLV_IIR, iir_mask);
+        I915_WRITE(VLV_IIR, iir_mask);
+        POSTING_READ(VLV_IIR);
+
+        pipestat_mask = PLANE_FLIP_DONE_INT_STATUS_VLV |
+                        PIPE_CRC_DONE_INTERRUPT_STATUS;
+
+        i915_disable_pipestat(dev_priv, PIPE_A, pipestat_mask |
+                                                PIPE_GMBUS_INTERRUPT_STATUS);
+        i915_disable_pipestat(dev_priv, PIPE_B, pipestat_mask);
+
+        pipestat_mask = PIPESTAT_INT_STATUS_MASK |
+                        PIPE_FIFO_UNDERRUN_STATUS;
+        I915_WRITE(PIPESTAT(PIPE_A), pipestat_mask);
+        I915_WRITE(PIPESTAT(PIPE_B), pipestat_mask);
+        POSTING_READ(PIPESTAT(PIPE_A));
+}
+
+void valleyview_enable_display_irqs(struct drm_i915_private *dev_priv)
+{
+        assert_spin_locked(&dev_priv->irq_lock);
+
+        if (dev_priv->display_irqs_enabled)
+                return;
+
+        dev_priv->display_irqs_enabled = true;
+
+        if (dev_priv->dev->irq_enabled)
+                valleyview_display_irqs_install(dev_priv);
+}
+
+void valleyview_disable_display_irqs(struct drm_i915_private *dev_priv)
+{
+        assert_spin_locked(&dev_priv->irq_lock);
+
+        if (!dev_priv->display_irqs_enabled)
+                return;
+
+        dev_priv->display_irqs_enabled = false;
+
+        if (dev_priv->dev->irq_enabled)
+                valleyview_display_irqs_uninstall(dev_priv);
+}
+
 static int valleyview_irq_postinstall(struct drm_device *dev)
 {
         drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
-        u32 enable_mask;
-        u32 pipestat_enable = PLANE_FLIP_DONE_INT_STATUS_VLV |
-                PIPE_CRC_DONE_INTERRUPT_STATUS;
         unsigned long irqflags;
 
-        enable_mask = I915_DISPLAY_PORT_INTERRUPT;
-        enable_mask |= I915_DISPLAY_PIPE_A_EVENT_INTERRUPT |
-                I915_DISPLAY_PIPE_B_EVENT_INTERRUPT;
-
-        dev_priv->irq_mask = ~enable_mask;
+        dev_priv->irq_mask = ~0;
 
         I915_WRITE(PORT_HOTPLUG_EN, 0);
         POSTING_READ(PORT_HOTPLUG_EN);
 
         I915_WRITE(VLV_IMR, dev_priv->irq_mask);
-        I915_WRITE(VLV_IER, enable_mask);
+        I915_WRITE(VLV_IER, ~dev_priv->irq_mask);
         I915_WRITE(VLV_IIR, 0xffffffff);
-        I915_WRITE(PIPESTAT(0), 0xffff);
-        I915_WRITE(PIPESTAT(1), 0xffff);
         POSTING_READ(VLV_IER);
 
         /* Interrupt setup is already guaranteed to be single-threaded, this is
          * just to make the assert_spin_locked check happy. */
         spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
-        i915_enable_pipestat(dev_priv, PIPE_A, pipestat_enable);
-        i915_enable_pipestat(dev_priv, PIPE_A, PIPE_GMBUS_INTERRUPT_STATUS);
-        i915_enable_pipestat(dev_priv, PIPE_B, pipestat_enable);
+        if (dev_priv->display_irqs_enabled)
+                valleyview_display_irqs_install(dev_priv);
         spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
 
         I915_WRITE(VLV_IIR, 0xffffffff);
@@ -3185,6 +3262,7 @@ static void gen8_irq_uninstall(struct drm_device *dev)
 static void valleyview_irq_uninstall(struct drm_device *dev)
 {
         drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
+        unsigned long irqflags;
         int pipe;
 
         if (!dev_priv)
@@ -3198,8 +3276,14 @@ static void valleyview_irq_uninstall(struct drm_device *dev)
         I915_WRITE(HWSTAM, 0xffffffff);
         I915_WRITE(PORT_HOTPLUG_EN, 0);
         I915_WRITE(PORT_HOTPLUG_STAT, I915_READ(PORT_HOTPLUG_STAT));
-        for_each_pipe(pipe)
-                I915_WRITE(PIPESTAT(pipe), 0xffff);
+
+        spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
+        if (dev_priv->display_irqs_enabled)
+                valleyview_display_irqs_uninstall(dev_priv);
+        spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
+
+        dev_priv->irq_mask = 0;
+
         I915_WRITE(VLV_IIR, 0xffffffff);
         I915_WRITE(VLV_IMR, 0xffffffff);
         I915_WRITE(VLV_IER, 0x0);