drm/i915/gmbus: convert to struct intel_display

[linux.git] / drivers / gpu / drm / i915 / display / intel_display_irq.c

diff --git a/drivers/gpu/drm/i915/display/intel_display_irq.c b/drivers/gpu/drm/i915/display/intel_display_irq.c
index a4f42ed3f21a77310370125804afa1eeff8f9607..0478fe3cdd8633351ac37e033a479f68e55af185 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_irq.c
+++ b/drivers/gpu/drm/i915/display/intel_display_irq.c
@@ -543,12 +543,13 @@ void i965_pipestat_irq_handler(struct drm_i915_private *dev_priv,
                intel_opregion_asle_intr(display);
 
        if (pipe_stats[0] & PIPE_GMBUS_INTERRUPT_STATUS)
-               intel_gmbus_irq_handler(dev_priv);
+               intel_gmbus_irq_handler(display);
 }
 
 void valleyview_pipestat_irq_handler(struct drm_i915_private *dev_priv,
                                     u32 pipe_stats[I915_MAX_PIPES])
 {
+       struct intel_display *display = &dev_priv->display;
        enum pipe pipe;
 
        for_each_pipe(dev_priv, pipe) {
@@ -566,7 +567,7 @@ void valleyview_pipestat_irq_handler(struct drm_i915_private *dev_priv,
        }
 
        if (pipe_stats[0] & PIPE_GMBUS_INTERRUPT_STATUS)
-               intel_gmbus_irq_handler(dev_priv);
+               intel_gmbus_irq_handler(display);
 }
 
 static void ibx_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)
@@ -588,7 +589,7 @@ static void ibx_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)
                intel_dp_aux_irq_handler(display);
 
        if (pch_iir & SDE_GMBUS)
-               intel_gmbus_irq_handler(dev_priv);
+               intel_gmbus_irq_handler(display);
 
        if (pch_iir & SDE_AUDIO_HDCP_MASK)
                drm_dbg(&dev_priv->drm, "PCH HDCP audio interrupt\n");
@@ -677,7 +678,7 @@ static void cpt_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)
                intel_dp_aux_irq_handler(display);
 
        if (pch_iir & SDE_GMBUS_CPT)
-               intel_gmbus_irq_handler(dev_priv);
+               intel_gmbus_irq_handler(display);
 
        if (pch_iir & SDE_AUDIO_CP_REQ_CPT)
                drm_dbg(&dev_priv->drm, "Audio CP request interrupt\n");
@@ -1109,7 +1110,7 @@ void gen8_de_irq_handler(struct drm_i915_private *dev_priv, u32 master_ctl)
 
                        if ((IS_GEMINILAKE(dev_priv) || IS_BROXTON(dev_priv)) &&
                            (iir & BXT_DE_PORT_GMBUS)) {
-                               intel_gmbus_irq_handler(dev_priv);
+                               intel_gmbus_irq_handler(display);
                                found = true;
                        }