summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_display.c
diff options
context:
space:
mode:
authorVille Syrjälä2013-09-24 20:26:31 +0200
committerDaniel Vetter2013-10-10 12:46:55 +0200
commit49e497ef43e06dbf65e0a3637bcaedb31ce17d34 (patch)
tree97a8f442894f2a3d2feeb0fde0434abf81812c91 /drivers/gpu/drm/i915/intel_display.c
parentdrm/i915: intel_limits_vlv_dac and intel_limits_vlv_hdmi are the same (diff)
downloadkernel-qcow2-linux-49e497ef43e06dbf65e0a3637bcaedb31ce17d34.tar.gz
kernel-qcow2-linux-49e497ef43e06dbf65e0a3637bcaedb31ce17d34.tar.xz
kernel-qcow2-linux-49e497ef43e06dbf65e0a3637bcaedb31ce17d34.zip
drm/i915: Don't lie about findind suitable PLL settings on VLV
If vlv_find_best_dpll() couldn't find suitable PLL settings, just say so instead of lying to caller. 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.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 1ea6d49b9380..0e87970a03f6 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -662,6 +662,7 @@ vlv_find_best_dpll(const intel_limit_t *limit, struct drm_crtc *crtc,
unsigned int bestppm = 1000000;
/* min update 19.2 MHz */
int max_n = min(limit->n.max, refclk / 19200);
+ bool found = false;
target *= 5; /* fast clock */
@@ -692,18 +693,20 @@ vlv_find_best_dpll(const intel_limit_t *limit, struct drm_crtc *crtc,
if (ppm < 100 && clock.p > best_clock->p) {
bestppm = 0;
*best_clock = clock;
+ found = true;
}
if (bestppm >= 10 && ppm < bestppm - 10) {
bestppm = ppm;
*best_clock = clock;
+ found = true;
}
}
}
}
}
- return true;
+ return found;
}
bool intel_crtc_active(struct drm_crtc *crtc)