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

Commit 80b6dda4 authored by Akash Goel's avatar Akash Goel Committed by Daniel Vetter
Browse files

drm/i915/skl: Updated intel_gpu_freq() and intel_freq_opcode() 



On SKL, frequency is specified in units of 16.66 MHZ.
Updated the intel_gpu_freq() and intel_freq_opecode() functions
to do the conversion appropriately.

Signed-off-by: default avatarAkash Goel <akash.goel@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent de43ae9d

drivers/gpu/drm/i915/intel_pm.c

+6 −2
Original line number Original line Diff line number Diff line
@@ -6696,7 +6696,9 @@ static int chv_freq_opcode(struct drm_i915_private *dev_priv, int val) 




int intel_gpu_freq(struct drm_i915_private *dev_priv, int val)

int intel_gpu_freq(struct drm_i915_private *dev_priv, int val)

{

{

	if (IS_CHERRYVIEW(dev_priv->dev))

	if (IS_GEN9(dev_priv->dev))

		return (val * GT_FREQUENCY_MULTIPLIER) / GEN9_FREQ_SCALER;

	else if (IS_CHERRYVIEW(dev_priv->dev))

		return chv_gpu_freq(dev_priv, val);

		return chv_gpu_freq(dev_priv, val);

	else if (IS_VALLEYVIEW(dev_priv->dev))

	else if (IS_VALLEYVIEW(dev_priv->dev))

		return byt_gpu_freq(dev_priv, val);

		return byt_gpu_freq(dev_priv, val);
@@ -6706,7 +6708,9 @@ int intel_gpu_freq(struct drm_i915_private *dev_priv, int val) 




int intel_freq_opcode(struct drm_i915_private *dev_priv, int val)

int intel_freq_opcode(struct drm_i915_private *dev_priv, int val)

{

{

	if (IS_CHERRYVIEW(dev_priv->dev))

	if (IS_GEN9(dev_priv->dev))

		return (val * GEN9_FREQ_SCALER) / GT_FREQUENCY_MULTIPLIER;

	else if (IS_CHERRYVIEW(dev_priv->dev))

		return chv_freq_opcode(dev_priv, val);

		return chv_freq_opcode(dev_priv, val);

	else if (IS_VALLEYVIEW(dev_priv->dev))

	else if (IS_VALLEYVIEW(dev_priv->dev))

		return byt_freq_opcode(dev_priv, val);

		return byt_freq_opcode(dev_priv, val);