On Mon, 2016-12-19 at 19:28 +0200, ville.syrjala@xxxxxxxxxxxxxxx wrote: > From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > > Clean up the dev vs. dev_priv straggles that are making things > look inconsistentt. > > v2: Deal with churn > > Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> Reviewed-by: Ander Conselvan de Oliveira <conselvan2@xxxxxxxxx> > --- > drivers/gpu/drm/i915/intel_cdclk.c | 25 ++++++++++--------------- > 1 file changed, 10 insertions(+), 15 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_cdclk.c > b/drivers/gpu/drm/i915/intel_cdclk.c > index 08ae3b78b8ed..2e998fa087a9 100644 > --- a/drivers/gpu/drm/i915/intel_cdclk.c > +++ b/drivers/gpu/drm/i915/intel_cdclk.c > @@ -433,9 +433,8 @@ static void vlv_program_pfi_credits(struct > drm_i915_private *dev_priv) > WARN_ON(I915_READ(GCI_CONTROL) & PFI_CREDIT_RESEND); > } > > -static void vlv_set_cdclk(struct drm_device *dev, int cdclk) > +static void vlv_set_cdclk(struct drm_i915_private *dev_priv, int cdclk) > { > - struct drm_i915_private *dev_priv = to_i915(dev); > u32 val, cmd; > > if (cdclk >= 320000) /* jump to highest voltage for 400MHz too */ > @@ -496,9 +495,8 @@ static void vlv_set_cdclk(struct drm_device *dev, int > cdclk) > intel_update_cdclk(dev_priv); > } > > -static void chv_set_cdclk(struct drm_device *dev, int cdclk) > +static void chv_set_cdclk(struct drm_i915_private *dev_priv, int cdclk) > { > - struct drm_i915_private *dev_priv = to_i915(dev); > u32 val, cmd; > > switch (cdclk) { > @@ -566,9 +564,8 @@ static void bdw_get_cdclk(struct drm_i915_private > *dev_priv, > cdclk_state->cdclk = 675000; > } > > -static void bdw_set_cdclk(struct drm_device *dev, int cdclk) > +static void bdw_set_cdclk(struct drm_i915_private *dev_priv, int cdclk) > { > - struct drm_i915_private *dev_priv = to_i915(dev); > uint32_t val, data; > int ret; > > @@ -1363,8 +1360,7 @@ static int intel_max_pixel_rate(struct drm_atomic_state > *state) > > static int vlv_modeset_calc_cdclk(struct drm_atomic_state *state) > { > - struct drm_device *dev = state->dev; > - struct drm_i915_private *dev_priv = to_i915(dev); > + struct drm_i915_private *dev_priv = to_i915(state->dev); > int max_pixclk = intel_max_pixel_rate(state); > struct intel_atomic_state *intel_state = > to_intel_atomic_state(state); > @@ -1394,8 +1390,7 @@ static int vlv_modeset_calc_cdclk(struct > drm_atomic_state *state) > > static void vlv_modeset_commit_cdclk(struct drm_atomic_state *old_state) > { > - struct drm_device *dev = old_state->dev; > - struct drm_i915_private *dev_priv = to_i915(dev); > + struct drm_i915_private *dev_priv = to_i915(old_state->dev); > unsigned int req_cdclk = dev_priv->cdclk.actual.cdclk; > > /* > @@ -1410,9 +1405,9 @@ static void vlv_modeset_commit_cdclk(struct > drm_atomic_state *old_state) > intel_display_power_get(dev_priv, POWER_DOMAIN_PIPE_A); > > if (IS_CHERRYVIEW(dev_priv)) > - chv_set_cdclk(dev, req_cdclk); > + chv_set_cdclk(dev_priv, req_cdclk); > else > - vlv_set_cdclk(dev, req_cdclk); > + vlv_set_cdclk(dev_priv, req_cdclk); > > vlv_program_pfi_credits(dev_priv); > > @@ -1454,10 +1449,10 @@ static int bdw_modeset_calc_cdclk(struct > drm_atomic_state *state) > > static void bdw_modeset_commit_cdclk(struct drm_atomic_state *old_state) > { > - struct drm_device *dev = old_state->dev; > - unsigned int req_cdclk = to_i915(dev)->cdclk.actual.cdclk; > + struct drm_i915_private *dev_priv = to_i915(old_state->dev); > + unsigned int req_cdclk = dev_priv->cdclk.actual.cdclk; > > - bdw_set_cdclk(dev, req_cdclk); > + bdw_set_cdclk(dev_priv, req_cdclk); > } > > static int skl_modeset_calc_cdclk(struct drm_atomic_state *state) _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx