drm/i915/clockgating: pass display to DSPCNTR and DSPSURF register macros

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

Reviewed-by: Gustavo Sousa <gustavo.sousa@intel.com>
Link: https://lore.kernel.org/r/014410b59845b401950faff992540ea9b32ac213.1754499175.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/intel_clock_gating.c b/drivers/gpu/drm/i915/intel_clock_gating.c
index bd919fa3bee5bbe75258dadcaacbb972daacbbdb..e501f49375107058de828fe68d9dd2139738a231 100644 (file)
--- 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));
        }
 }