drm/i915/irq: Pair up the vblank enable/disable functions

The current way of organizing all .vblank_enable() functions
before all .vblabk_disable() functions is infuriating. It's
really hard to compare the enable() vs. disable() for the
same platform to make sure they properly mirror each other.

Reorganize the functions so that the enable+disable for
the same platoform are next to each.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241001195803.3371-3-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_display_irq.c b/drivers/gpu/drm/i915/display/intel_display_irq.c
index 0ea1fcc61dde146b88e3f4458d3bffc9e17fa665..43a0b3565bc898d505851589c4e5e80c35704b3a 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_irq.c
+++ b/drivers/gpu/drm/i915/display/intel_display_irq.c
@@ -1272,6 +1272,17 @@ int i8xx_enable_vblank(struct drm_crtc *crtc)
        return 0;
 }
 
+void i8xx_disable_vblank(struct drm_crtc *crtc)
+{
+       struct drm_i915_private *dev_priv = to_i915(crtc->dev);
+       enum pipe pipe = to_intel_crtc(crtc)->pipe;
+       unsigned long irqflags;
+
+       spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
+       i915_disable_pipestat(dev_priv, pipe, PIPE_VBLANK_INTERRUPT_STATUS);
+       spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
+}
+
 int i915gm_enable_vblank(struct drm_crtc *crtc)
 {
        struct drm_i915_private *i915 = to_i915(crtc->dev);
@@ -1288,6 +1299,16 @@ int i915gm_enable_vblank(struct drm_crtc *crtc)
        return i8xx_enable_vblank(crtc);
 }
 
+void i915gm_disable_vblank(struct drm_crtc *crtc)
+{
+       struct drm_i915_private *i915 = to_i915(crtc->dev);
+
+       i8xx_disable_vblank(crtc);
+
+       if (--i915->display.irq.vblank_enabled == 0)
+               intel_uncore_write(&i915->uncore, SCPD0, _MASKED_BIT_DISABLE(CSTATE_RENDER_CLOCK_GATE_DISABLE));
+}
+
 int i965_enable_vblank(struct drm_crtc *crtc)
 {
        struct drm_i915_private *dev_priv = to_i915(crtc->dev);
@@ -1302,6 +1323,18 @@ int i965_enable_vblank(struct drm_crtc *crtc)
        return 0;
 }
 
+void i965_disable_vblank(struct drm_crtc *crtc)
+{
+       struct drm_i915_private *dev_priv = to_i915(crtc->dev);
+       enum pipe pipe = to_intel_crtc(crtc)->pipe;
+       unsigned long irqflags;
+
+       spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
+       i915_disable_pipestat(dev_priv, pipe,
+                             PIPE_START_VBLANK_INTERRUPT_STATUS);
+       spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
+}
+
 int ilk_enable_vblank(struct drm_crtc *crtc)
 {
        struct drm_i915_private *dev_priv = to_i915(crtc->dev);
@@ -1323,6 +1356,19 @@ int ilk_enable_vblank(struct drm_crtc *crtc)
        return 0;
 }
 
+void ilk_disable_vblank(struct drm_crtc *crtc)
+{
+       struct drm_i915_private *dev_priv = to_i915(crtc->dev);
+       enum pipe pipe = to_intel_crtc(crtc)->pipe;
+       unsigned long irqflags;
+       u32 bit = DISPLAY_VER(dev_priv) >= 7 ?
+               DE_PIPE_VBLANK_IVB(pipe) : DE_PIPE_VBLANK(pipe);
+
+       spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
+       ilk_disable_display_irq(dev_priv, bit);
+       spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
+}
+
 static bool gen11_dsi_configure_te(struct intel_crtc *intel_crtc,
                                   bool enable)
 {
@@ -1391,52 +1437,6 @@ int bdw_enable_vblank(struct drm_crtc *_crtc)
        return 0;
 }
 
-void i8xx_disable_vblank(struct drm_crtc *crtc)
-{
-       struct drm_i915_private *dev_priv = to_i915(crtc->dev);
-       enum pipe pipe = to_intel_crtc(crtc)->pipe;
-       unsigned long irqflags;
-
-       spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
-       i915_disable_pipestat(dev_priv, pipe, PIPE_VBLANK_INTERRUPT_STATUS);
-       spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
-}
-
-void i915gm_disable_vblank(struct drm_crtc *crtc)
-{
-       struct drm_i915_private *i915 = to_i915(crtc->dev);
-
-       i8xx_disable_vblank(crtc);
-
-       if (--i915->display.irq.vblank_enabled == 0)
-               intel_uncore_write(&i915->uncore, SCPD0, _MASKED_BIT_DISABLE(CSTATE_RENDER_CLOCK_GATE_DISABLE));
-}
-
-void i965_disable_vblank(struct drm_crtc *crtc)
-{
-       struct drm_i915_private *dev_priv = to_i915(crtc->dev);
-       enum pipe pipe = to_intel_crtc(crtc)->pipe;
-       unsigned long irqflags;
-
-       spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
-       i915_disable_pipestat(dev_priv, pipe,
-                             PIPE_START_VBLANK_INTERRUPT_STATUS);
-       spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
-}
-
-void ilk_disable_vblank(struct drm_crtc *crtc)
-{
-       struct drm_i915_private *dev_priv = to_i915(crtc->dev);
-       enum pipe pipe = to_intel_crtc(crtc)->pipe;
-       unsigned long irqflags;
-       u32 bit = DISPLAY_VER(dev_priv) >= 7 ?
-               DE_PIPE_VBLANK_IVB(pipe) : DE_PIPE_VBLANK(pipe);
-
-       spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
-       ilk_disable_display_irq(dev_priv, bit);
-       spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
-}
-
 void bdw_disable_vblank(struct drm_crtc *_crtc)
 {
        struct intel_crtc *crtc = to_intel_crtc(_crtc);