| From 17b99107159758042d73cbbdb5bc4dd844570ee4 Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com> |
| Date: Mon, 14 Oct 2013 14:50:31 +0300 |
| Subject: drm/i915: Use vlv_clock() in vlv_crtc_clock_get() |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| Avoid some code duplication. |
| |
| Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> |
| Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org> |
| Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> |
| (cherry picked from commit f646628b9f40cbd1c13a0eb190901c6a78395be6) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/gpu/drm/i915/intel_display.c | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c |
| index 32cd88cb8580..fb210b0774af 100644 |
| --- a/drivers/gpu/drm/i915/intel_display.c |
| +++ b/drivers/gpu/drm/i915/intel_display.c |
| @@ -5211,10 +5211,10 @@ static void vlv_crtc_clock_get(struct intel_crtc *crtc, |
| clock.p1 = (mdiv >> DPIO_P1_SHIFT) & 7; |
| clock.p2 = (mdiv >> DPIO_P2_SHIFT) & 0x1f; |
| |
| - clock.vco = refclk * clock.m1 * clock.m2 / clock.n; |
| - clock.dot = 2 * clock.vco / (clock.p1 * clock.p2); |
| + vlv_clock(refclk, &clock); |
| |
| - pipe_config->port_clock = clock.dot / 10; |
| + /* clock.dot is the fast clock */ |
| + pipe_config->port_clock = clock.dot / 5; |
| } |
| |
| static bool i9xx_get_pipe_config(struct intel_crtc *crtc, |
| -- |
| 1.8.5.rc3 |
| |
