[Intel-gfx] [PATCH 04/13] drm/i915: Don't pass dev_priv to broxton_calc_cdclk()

[Jani Nikula]

On Wed, 11 May 2016, ville.syrjala at linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala at linux.intel.com>
>
> broxton_calc_cdclk() doesn't need dev_priv for anything, so let's not
> bother passing it around.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>

Reviewed-by: Jani Nikula <jani.nikula at intel.com>


> ---
>  drivers/gpu/drm/i915/intel_display.c | 8 +++-----
>  1 file changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index a9e5d6b81043..deeaf3ba1dee 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -5900,8 +5900,7 @@ static int valleyview_calc_cdclk(struct drm_i915_private *dev_priv,
>  		return 200000;
>  }
>  
> -static int broxton_calc_cdclk(struct drm_i915_private *dev_priv,
> -			      int max_pixclk)
> +static int broxton_calc_cdclk(int max_pixclk)
>  {
>  	/*
>  	 * FIXME:
> @@ -5969,16 +5968,15 @@ static int valleyview_modeset_calc_cdclk(struct drm_atomic_state *state)
>  static int broxton_modeset_calc_cdclk(struct drm_atomic_state *state)
>  {
>  	struct drm_device *dev = state->dev;
> -	struct drm_i915_private *dev_priv = dev->dev_private;
>  	int max_pixclk = intel_mode_max_pixclk(dev, state);
>  	struct intel_atomic_state *intel_state =
>  		to_intel_atomic_state(state);
>  
>  	intel_state->cdclk = intel_state->dev_cdclk =
> -		broxton_calc_cdclk(dev_priv, max_pixclk);
> +		broxton_calc_cdclk(max_pixclk);
>  
>  	if (!intel_state->active_crtcs)
> -		intel_state->dev_cdclk = broxton_calc_cdclk(dev_priv, 0);
> +		intel_state->dev_cdclk = broxton_calc_cdclk(0);
>  
>  	return 0;
>  }

-- 
Jani Nikula, Intel Open Source Technology Center