Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c44deb6c authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Don't pass dev_priv to broxton_calc_cdclk() 



broxton_calc_cdclk() doesn't need dev_priv for anything, so let's not
bother passing it around.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1462995892-32416-5-git-send-email-ville.syrjala@linux.intel.com


Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 445e780b

drivers/gpu/drm/i915/intel_display.c

+3 −5
Original line number Diff line number Diff line
@@ -5896,8 +5896,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:
@@ -5965,16 +5964,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;

}