[Intel-gfx] [PATCH 2/2] drm/i915: Use vlv_clock() in vlv_crtc_clock_get()
From: Ville Syrjälä ville.syrj...@linux.intel.com Avoid some code duplication. Signed-off-by: Ville Syrjälä ville.syrj...@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 baa6ef6..b334c50 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.1.5 ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 2/2] drm/i915: Use vlv_clock() in vlv_crtc_clock_get()
On Mon, 14 Oct 2013 14:50:31 +0300 ville.syrj...@linux.intel.com wrote: From: Ville Syrjälä ville.syrj...@linux.intel.com Avoid some code duplication. Signed-off-by: Ville Syrjälä ville.syrj...@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 baa6ef6..b334c50 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, Looks like this will result in the same bits. Reviewed-by: Jesse Barnes jbar...@virtuousgeek.org -- Jesse Barnes, Intel Open Source Technology Center ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 2/2] drm/i915: Use vlv_clock() in vlv_crtc_clock_get()
On Mon, Oct 14, 2013 at 07:44:16AM -0700, Jesse Barnes wrote: On Mon, 14 Oct 2013 14:50:31 +0300 ville.syrj...@linux.intel.com wrote: From: Ville Syrjälä ville.syrj...@linux.intel.com Avoid some code duplication. Signed-off-by: Ville Syrjälä ville.syrj...@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 baa6ef6..b334c50 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, Looks like this will result in the same bits. Reviewed-by: Jesse Barnes jbar...@virtuousgeek.org Both merged, thanks for patchesreview. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx
