* [PATCH 1/2] drm/i915: Use DIV_ROUND_CLOSEST() to calculate dot/vco
@ 2013-10-14 11:50 ville.syrjala
2013-10-14 11:50 ` [PATCH 2/2] drm/i915: Use vlv_clock() in vlv_crtc_clock_get() ville.syrjala
2013-10-14 14:43 ` [PATCH 1/2] drm/i915: Use DIV_ROUND_CLOSEST() to calculate dot/vco Jesse Barnes
0 siblings, 2 replies; 5+ messages in thread
From: ville.syrjala @ 2013-10-14 11:50 UTC (permalink / raw)
To: intel-gfx
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
Rounding down when calculating the dot/vco frequencies doesn't make much
sense. Round to closest should give slightly nicer answers.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/intel_display.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index fbd028e..baa6ef6 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -329,8 +329,8 @@ static void vlv_clock(int refclk, intel_clock_t *clock)
{
clock->m = clock->m1 * clock->m2;
clock->p = clock->p1 * clock->p2;
- clock->vco = refclk * clock->m / clock->n;
- clock->dot = clock->vco / clock->p;
+ clock->vco = DIV_ROUND_CLOSEST(refclk * clock->m, clock->n);
+ clock->dot = DIV_ROUND_CLOSEST(clock->vco, clock->p);
}
/**
@@ -430,8 +430,8 @@ static void pineview_clock(int refclk, intel_clock_t *clock)
{
clock->m = clock->m2 + 2;
clock->p = clock->p1 * clock->p2;
- clock->vco = refclk * clock->m / clock->n;
- clock->dot = clock->vco / clock->p;
+ clock->vco = DIV_ROUND_CLOSEST(refclk * clock->m, clock->n);
+ clock->dot = DIV_ROUND_CLOSEST(clock->vco, clock->p);
}
static uint32_t i9xx_dpll_compute_m(struct dpll *dpll)
@@ -443,8 +443,8 @@ static void i9xx_clock(int refclk, intel_clock_t *clock)
{
clock->m = i9xx_dpll_compute_m(clock);
clock->p = clock->p1 * clock->p2;
- clock->vco = refclk * clock->m / (clock->n + 2);
- clock->dot = clock->vco / clock->p;
+ clock->vco = DIV_ROUND_CLOSEST(refclk * clock->m, clock->n + 2);
+ clock->dot = DIV_ROUND_CLOSEST(clock->vco, clock->p);
}
#define INTELPllInvalid(s) do { /* DRM_DEBUG(s); */ return false; } while (0)
--
1.8.1.5
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 2/2] drm/i915: Use vlv_clock() in vlv_crtc_clock_get()
2013-10-14 11:50 [PATCH 1/2] drm/i915: Use DIV_ROUND_CLOSEST() to calculate dot/vco ville.syrjala
@ 2013-10-14 11:50 ` ville.syrjala
2013-10-14 14:44 ` Jesse Barnes
2013-10-14 14:43 ` [PATCH 1/2] drm/i915: Use DIV_ROUND_CLOSEST() to calculate dot/vco Jesse Barnes
1 sibling, 1 reply; 5+ messages in thread
From: ville.syrjala @ 2013-10-14 11:50 UTC (permalink / raw)
To: intel-gfx
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
Avoid some code duplication.
Signed-off-by: Ville Syrjälä <ville.syrjala@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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] drm/i915: Use vlv_clock() in vlv_crtc_clock_get()
2013-10-14 11:50 ` [PATCH 2/2] drm/i915: Use vlv_clock() in vlv_crtc_clock_get() ville.syrjala
@ 2013-10-14 14:44 ` Jesse Barnes
2013-10-14 14:59 ` Daniel Vetter
0 siblings, 1 reply; 5+ messages in thread
From: Jesse Barnes @ 2013-10-14 14:44 UTC (permalink / raw)
To: ville.syrjala; +Cc: intel-gfx
On Mon, 14 Oct 2013 14:50:31 +0300
ville.syrjala@linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Avoid some code duplication.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@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 <jbarnes@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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] drm/i915: Use vlv_clock() in vlv_crtc_clock_get()
2013-10-14 14:44 ` Jesse Barnes
@ 2013-10-14 14:59 ` Daniel Vetter
0 siblings, 0 replies; 5+ messages in thread
From: Daniel Vetter @ 2013-10-14 14:59 UTC (permalink / raw)
To: Jesse Barnes; +Cc: intel-gfx
On Mon, Oct 14, 2013 at 07:44:16AM -0700, Jesse Barnes wrote:
> On Mon, 14 Oct 2013 14:50:31 +0300
> ville.syrjala@linux.intel.com wrote:
>
> > From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> >
> > Avoid some code duplication.
> >
> > Signed-off-by: Ville Syrjälä <ville.syrjala@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 <jbarnes@virtuousgeek.org>
Both merged, thanks for patches&review.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] drm/i915: Use DIV_ROUND_CLOSEST() to calculate dot/vco
2013-10-14 11:50 [PATCH 1/2] drm/i915: Use DIV_ROUND_CLOSEST() to calculate dot/vco ville.syrjala
2013-10-14 11:50 ` [PATCH 2/2] drm/i915: Use vlv_clock() in vlv_crtc_clock_get() ville.syrjala
@ 2013-10-14 14:43 ` Jesse Barnes
1 sibling, 0 replies; 5+ messages in thread
From: Jesse Barnes @ 2013-10-14 14:43 UTC (permalink / raw)
To: ville.syrjala; +Cc: intel-gfx
On Mon, 14 Oct 2013 14:50:30 +0300
ville.syrjala@linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Rounding down when calculating the dot/vco frequencies doesn't make much
> sense. Round to closest should give slightly nicer answers.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
> drivers/gpu/drm/i915/intel_display.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index fbd028e..baa6ef6 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -329,8 +329,8 @@ static void vlv_clock(int refclk, intel_clock_t *clock)
> {
> clock->m = clock->m1 * clock->m2;
> clock->p = clock->p1 * clock->p2;
> - clock->vco = refclk * clock->m / clock->n;
> - clock->dot = clock->vco / clock->p;
> + clock->vco = DIV_ROUND_CLOSEST(refclk * clock->m, clock->n);
> + clock->dot = DIV_ROUND_CLOSEST(clock->vco, clock->p);
> }
>
> /**
> @@ -430,8 +430,8 @@ static void pineview_clock(int refclk, intel_clock_t *clock)
> {
> clock->m = clock->m2 + 2;
> clock->p = clock->p1 * clock->p2;
> - clock->vco = refclk * clock->m / clock->n;
> - clock->dot = clock->vco / clock->p;
> + clock->vco = DIV_ROUND_CLOSEST(refclk * clock->m, clock->n);
> + clock->dot = DIV_ROUND_CLOSEST(clock->vco, clock->p);
> }
>
> static uint32_t i9xx_dpll_compute_m(struct dpll *dpll)
> @@ -443,8 +443,8 @@ static void i9xx_clock(int refclk, intel_clock_t *clock)
> {
> clock->m = i9xx_dpll_compute_m(clock);
> clock->p = clock->p1 * clock->p2;
> - clock->vco = refclk * clock->m / (clock->n + 2);
> - clock->dot = clock->vco / clock->p;
> + clock->vco = DIV_ROUND_CLOSEST(refclk * clock->m, clock->n + 2);
> + clock->dot = DIV_ROUND_CLOSEST(clock->vco, clock->p);
> }
>
> #define INTELPllInvalid(s) do { /* DRM_DEBUG(s); */ return false; } while (0)
Reviewed-by: Jesse Barnes <jbarnes@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
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-10-14 14:59 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-14 11:50 [PATCH 1/2] drm/i915: Use DIV_ROUND_CLOSEST() to calculate dot/vco ville.syrjala
2013-10-14 11:50 ` [PATCH 2/2] drm/i915: Use vlv_clock() in vlv_crtc_clock_get() ville.syrjala
2013-10-14 14:44 ` Jesse Barnes
2013-10-14 14:59 ` Daniel Vetter
2013-10-14 14:43 ` [PATCH 1/2] drm/i915: Use DIV_ROUND_CLOSEST() to calculate dot/vco Jesse Barnes
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox