[PATCH 05/15] drm/i915/clockgating: pass display to DSPCNTR and DSPSURF register macros

[Jani Nikula]

Underneath, the macros expect struct intel_display. Switch to it in
preparation for removing the transitional __to_intel_display() macro.

Signed-off-by: Jani Nikula <jani.nik...@intel.com>
---
 drivers/gpu/drm/i915/intel_clock_gating.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_clock_gating.c 
b/drivers/gpu/drm/i915/intel_clock_gating.c
index bd919fa3bee5..e501f4937510 100644
--- a/drivers/gpu/drm/i915/intel_clock_gating.c
+++ b/drivers/gpu/drm/i915/intel_clock_gating.c
@@ -136,13 +136,13 @@ static void g4x_disable_trickle_feed(struct 
drm_i915_private *dev_priv)
        enum pipe pipe;
 
        for_each_pipe(display, pipe) {
-               intel_uncore_rmw(&dev_priv->uncore, DSPCNTR(dev_priv, pipe),
+               intel_uncore_rmw(&dev_priv->uncore, DSPCNTR(display, pipe),
                                 0, DISP_TRICKLE_FEED_DISABLE);
 
-               intel_uncore_rmw(&dev_priv->uncore, DSPSURF(dev_priv, pipe),
+               intel_uncore_rmw(&dev_priv->uncore, DSPSURF(display, pipe),
                                 0, 0);
                intel_uncore_posting_read(&dev_priv->uncore,
-                                         DSPSURF(dev_priv, pipe));
+                                         DSPSURF(display, pipe));
        }
 }
 
-- 
2.39.5