Skip to content

Commit

Permalink
drm/i915/vlv: fix up broken precision in vlv_crtc_clock_get
Browse files Browse the repository at this point in the history
With some divider values we end up with the wrong result.  So remove the
intermediates (like Ville suggested in the first place) to get the right
answer.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Chris Wilson authored and Daniel Vetter committed Oct 1, 2013
1 parent acbec81 commit 662c6ec
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions drivers/gpu/drm/i915/intel_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -5084,7 +5084,7 @@ static void vlv_crtc_clock_get(struct intel_crtc *crtc,
int pipe = pipe_config->cpu_transcoder;
intel_clock_t clock;
u32 mdiv;
int refclk = 100000, fastclk, update_rate;
int refclk = 100000;

mutex_lock(&dev_priv->dpio_lock);
mdiv = vlv_dpio_read(dev_priv, pipe, DPIO_DIV(pipe));
Expand All @@ -5096,10 +5096,8 @@ static void vlv_crtc_clock_get(struct intel_crtc *crtc,
clock.p1 = (mdiv >> DPIO_P1_SHIFT) & 7;
clock.p2 = (mdiv >> DPIO_P2_SHIFT) & 0x1f;

update_rate = refclk / clock.n;
clock.vco = update_rate * clock.m1 * clock.m2;
fastclk = clock.vco / clock.p1 / clock.p2;
clock.dot = (2 * fastclk);
clock.vco = refclk * clock.m1 * clock.m2 / clock.n;
clock.dot = 2 * clock.vco / (clock.p1 * clock.p2);

pipe_config->port_clock = clock.dot / 10;
}
Expand Down

0 comments on commit 662c6ec

Please sign in to comment.