diff options
| author | Imre Deak | 2016-01-29 13:52:27 +0100 |
|---|---|---|
| committer | Imre Deak | 2016-02-02 17:28:25 +0100 |
| commit | 9c06f6744d663205395f88d98aef87edcd3ce5bd (patch) | |
| tree | 4b767adc94e44394e3172dc55a29c4b624177cac /drivers/gpu/drm/i915/intel_pm.c | |
| parent | drm/i915: Sanity check DP AUX message buffer and size (diff) | |
| download | kernel-qcow2-linux-9c06f6744d663205395f88d98aef87edcd3ce5bd.tar.gz kernel-qcow2-linux-9c06f6744d663205395f88d98aef87edcd3ce5bd.tar.xz kernel-qcow2-linux-9c06f6744d663205395f88d98aef87edcd3ce5bd.zip | |
drm/i915/chv: Fix error path in GPU freq helpers
Atm we wouldn't catch these errors or on the error path we would end up
with a division-by-zero, fix this up.
Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: David Weinehall <david.weinehall@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1454071949-24677-2-git-send-email-imre.deak@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_pm.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_pm.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 31bc4ea395ac..a47b8f219357 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -7185,9 +7185,10 @@ static int chv_gpu_freq(struct drm_i915_private *dev_priv, int val) { int div, czclk_freq = DIV_ROUND_CLOSEST(dev_priv->czclk_freq, 1000); - div = vlv_gpu_freq_div(czclk_freq) / 2; + div = vlv_gpu_freq_div(czclk_freq); if (div < 0) return div; + div /= 2; return DIV_ROUND_CLOSEST(czclk_freq * val, 2 * div) / 2; } @@ -7196,9 +7197,10 @@ static int chv_freq_opcode(struct drm_i915_private *dev_priv, int val) { int mul, czclk_freq = DIV_ROUND_CLOSEST(dev_priv->czclk_freq, 1000); - mul = vlv_gpu_freq_div(czclk_freq) / 2; + mul = vlv_gpu_freq_div(czclk_freq); if (mul < 0) return mul; + mul /= 2; /* CHV needs even values */ return DIV_ROUND_CLOSEST(val * 2 * mul, czclk_freq) * 2; |