diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2013-09-24 21:26:23 +0300 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-10-10 12:46:51 +0200 |
| commit | c1a9ae43885246df7a35c790960d7a703b2841d4 (patch) | |
| tree | 9f1cc7cfd68da667742752ace1be37d2e9cd9b2c | |
| parent | 6b4bf1c4952a65fae6b4043054b146642f031f19 (diff) | |
| download | op-kernel-dev-c1a9ae43885246df7a35c790960d7a703b2841d4.zip op-kernel-dev-c1a9ae43885246df7a35c790960d7a703b2841d4.tar.gz | |
drm/i915: De-magic the VLV p2 divider step size
The p2 divider on VLV needs to be even when it's > 10. The current code
to make that happen is rather weird. Just make the step size adjustement
in the for loop decrement step.
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>
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index d984b10..62cfada 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -688,9 +688,8 @@ vlv_find_best_dpll(const intel_limit_t *limit, struct drm_crtc *crtc, /* based on hardware requirement, prefer smaller n to precision */ for (clock.n = limit->n.min; clock.n <= ((refclk) / minupdate); clock.n++) { for (clock.p1 = limit->p1.max; clock.p1 > limit->p1.min; clock.p1--) { - for (clock.p2 = limit->p2.p2_fast+1; clock.p2 > 0; clock.p2--) { - if (clock.p2 > 10) - clock.p2--; + for (clock.p2 = limit->p2.p2_fast; clock.p2 > 0; + clock.p2 -= clock.p2 > 10 ? 2 : 1) { clock.p = clock.p1 * clock.p2; /* based on hardware requirement, prefer bigger m1,m2 values */ for (clock.m1 = limit->m1.min; clock.m1 <= limit->m1.max; clock.m1++) { |
