summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_display.c
diff options
context:
space:
mode:
authorVille Syrjälä2013-09-24 20:26:21 +0200
committerDaniel Vetter2013-10-10 12:46:50 +0200
commitc686122c638838ce7113aeb22e4f1c50446de6eb (patch)
tree75125c24589ef723484b11b2ed760a850db2ca91 /drivers/gpu/drm/i915/intel_display.c
parentdrm/i915: Make vlv_find_best_dpll() ppm calculation safe (diff)
downloadkernel-qcow2-linux-c686122c638838ce7113aeb22e4f1c50446de6eb.tar.gz
kernel-qcow2-linux-c686122c638838ce7113aeb22e4f1c50446de6eb.tar.xz
kernel-qcow2-linux-c686122c638838ce7113aeb22e4f1c50446de6eb.zip
drm/i915: Don't underflow bestppm
We do 'bestppm - 10' in vlv_find_best_dpll() but never check whether that might underflow. Add such a check. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
-rw-r--r--drivers/gpu/drm/i915/intel_display.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index dc5077560c74..789e6ab8fb19 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -708,7 +708,7 @@ vlv_find_best_dpll(const intel_limit_t *limit, struct drm_crtc *crtc,
bestppm = 0;
flag = 1;
}
- if (ppm < bestppm - 10) {
+ if (bestppm >= 10 && ppm < bestppm - 10) {
bestppm = ppm;
flag = 1;
}