Attachment 96604 Details for Bug 76564 – Possible fix v3

[patch] Possible fix v3

0001-drm-radeon-rework-finding-display-PLL-numbers.patch (text/plain), 7.66 KB, created by Christian König on 2014-03-29 21:10:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christian König

Created: 2014-03-29 21:10:20 UTC

Size: 7.66 KB

patch

obsolete

>From 45d7ed4a0e806d956d9ada6fb2cc7695149b9ea7 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
>Date: Fri, 28 Mar 2014 18:55:10 +0100
>Subject: [PATCH] drm/radeon: rework finding display PLL numbers
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Should yield better matching results.
>
>Signed-off-by: Christian KÃ¶nig <christian.koenig@amd.com>
>---
> drivers/gpu/drm/radeon/radeon_display.c | 212 ++++++++++++++++++--------------
> 1 file changed, 119 insertions(+), 93 deletions(-)
>
>diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
>index fbd8b93..f9c4aa8 100644
>--- a/drivers/gpu/drm/radeon/radeon_display.c
>+++ b/drivers/gpu/drm/radeon/radeon_display.c
>@@ -34,6 +34,8 @@
> #include <drm/drm_crtc_helper.h>
> #include <drm/drm_edid.h>
> 
>+#include <linux/gcd.h>
>+
> static void avivo_crtc_load_lut(struct drm_crtc *crtc)
> {
> 	struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc);
>@@ -799,121 +801,145 @@ int radeon_ddc_get_modes(struct radeon_connector *radeon_connector)
> }
> 
> /* avivo */
>-static void avivo_get_fb_div(struct radeon_pll *pll,
>-			     u32 target_clock,
>-			     u32 post_div,
>-			     u32 ref_div,
>-			     u32 *fb_div,
>-			     u32 *frac_fb_div)
>+void radeon_compute_pll_avivo(struct radeon_pll *pll,
>+			      u32 freq,
>+			      u32 *dot_clock_p,
>+			      u32 *fb_div_p,
>+			      u32 *frac_fb_div_p,
>+			      u32 *ref_div_p,
>+			      u32 *post_div_p)
> {
>-	u32 tmp = post_div * ref_div;
>-
>-	tmp *= target_clock;
>-	*fb_div = tmp / pll->reference_freq;
>-	*frac_fb_div = tmp % pll->reference_freq;
>+	unsigned fb_div_min, fb_div_max, fb_div;
>+	unsigned post_div_min, post_div_max, post_div;
>+	unsigned ref_div_min, ref_div_max, ref_div;
>+	unsigned post_div_best, diff_best;
>+	unsigned nom, den, tmp;
> 
>-        if (*fb_div > pll->max_feedback_div)
>-		*fb_div = pll->max_feedback_div;
>-        else if (*fb_div < pll->min_feedback_div)
>-                *fb_div = pll->min_feedback_div;
>-}
>+	/* determine allowed feedback divider range */
>+	fb_div_min = pll->min_feedback_div;
>+	fb_div_max = pll->max_feedback_div;
> 
>-static u32 avivo_get_post_div(struct radeon_pll *pll,
>-			      u32 target_clock)
>-{
>-	u32 vco, post_div, tmp;
>+	if (pll->flags & RADEON_PLL_USE_FRAC_FB_DIV) {
>+		fb_div_min *= 10;
>+		fb_div_max *= 10;
>+	}
> 
>-	if (pll->flags & RADEON_PLL_USE_POST_DIV)
>-		return pll->post_div;
>+	/* determine allowed ref divider range */
>+	if (pll->flags & RADEON_PLL_USE_REF_DIV)
>+		ref_div_min = pll->reference_div;
>+	else
>+		ref_div_min = pll->min_ref_div;
>+	ref_div_max = pll->max_ref_div;
> 
>-	if (pll->flags & RADEON_PLL_PREFER_MINM_OVER_MAXP) {
>-		if (pll->flags & RADEON_PLL_IS_LCD)
>-			vco = pll->lcd_pll_out_min;
>-		else
>-			vco = pll->pll_out_min;
>+	/* determine allowed post divider range */
>+	if (pll->flags & RADEON_PLL_USE_POST_DIV) {
>+		post_div_min = pll->post_div;
>+		post_div_max = pll->post_div;
> 	} else {
>-		if (pll->flags & RADEON_PLL_IS_LCD)
>-			vco = pll->lcd_pll_out_max;
>-		else
>-			vco = pll->pll_out_max;
>+		unsigned target_clock = freq / 10;
>+		unsigned vco_min, vco_max;
>+
>+		if (pll->flags & RADEON_PLL_IS_LCD) {
>+			vco_min = pll->lcd_pll_out_min;
>+			vco_max = pll->lcd_pll_out_max;
>+		} else {
>+			vco_min = pll->pll_out_min;
>+			vco_max = pll->pll_out_max;
>+		}
>+
>+		post_div_min = vco_min / target_clock;
>+		if ((target_clock * post_div_min) < vco_min)
>+			++post_div_min;
>+		if (post_div_min < pll->min_post_div)
>+			post_div_min = pll->min_post_div;
>+
>+		post_div_max = vco_max / target_clock;
>+		if ((target_clock * post_div_max) > vco_max)
>+			--post_div_max;
>+		if (post_div_max > pll->max_post_div)
>+			post_div_max = pll->max_post_div;
> 	}
> 
>-	post_div = vco / target_clock;
>-	tmp = vco % target_clock;
>+	/* represent the searched ratio as fractional number */
>+	nom = pll->flags & RADEON_PLL_USE_FRAC_FB_DIV ? freq : freq / 10;
>+	den = pll->reference_freq;
> 
>-	if (pll->flags & RADEON_PLL_PREFER_MINM_OVER_MAXP) {
>-		if (tmp)
>-			post_div++;
>-	} else {
>-		if (!tmp)
>-			post_div--;
>+	/* reduce the numbers to a simpler ratio */
>+	tmp = gcd(nom, den);
>+	nom /= tmp;
>+	den /= tmp;
>+
>+	/* make sure nominator is big enough */
>+        if (nom < fb_div_min) {
>+		tmp = (fb_div_min + nom - 1) / nom;
>+		nom *= tmp;
>+		den *= tmp;
>+	}
>+
>+	/* make sure the denominator is big enough */
>+	tmp = ref_div_min * post_div_min;
>+	if (den < tmp) {
>+		tmp = (tmp + den - 1) / den;
>+		nom *= tmp;
>+		den *= tmp;
> 	}
> 
>-	if (post_div > pll->max_post_div)
>-		post_div = pll->max_post_div;
>-	else if (post_div < pll->min_post_div)
>-		post_div = pll->min_post_div;
>+	/* make sure that the post divider don't get to big */
>+	post_div_max = min(post_div_max, den / ref_div_min);
> 
>-	return post_div;
>-}
>+	/* now search for a post divider */
>+	if (pll->flags & RADEON_PLL_PREFER_MINM_OVER_MAXP)
>+		post_div_best = post_div_min;
>+	else
>+		post_div_best = post_div_max;
>+	diff_best = ~0;
> 
>-#define MAX_TOLERANCE 10
>+	for (post_div = post_div_min; post_div <= post_div_max; ++post_div) {
>+		unsigned diff = abs(den - den / post_div * post_div);
>+		if (diff < diff_best || (diff == diff_best &&
>+		    !(pll->flags & RADEON_PLL_PREFER_MINM_OVER_MAXP))) {
> 
>-void radeon_compute_pll_avivo(struct radeon_pll *pll,
>-			      u32 freq,
>-			      u32 *dot_clock_p,
>-			      u32 *fb_div_p,
>-			      u32 *frac_fb_div_p,
>-			      u32 *ref_div_p,
>-			      u32 *post_div_p)
>-{
>-	u32 target_clock = freq / 10;
>-	u32 post_div = avivo_get_post_div(pll, target_clock);
>-	u32 ref_div = pll->min_ref_div;
>-	u32 fb_div = 0, frac_fb_div = 0, tmp;
>+			post_div_best = post_div;
>+			diff_best = diff;
>+		}
>+	}
>+	post_div = post_div_best;
> 
>-	if (pll->flags & RADEON_PLL_USE_REF_DIV)
>-		ref_div = pll->reference_div;
>+	/* get matching reference and feedback divider */
>+	ref_div = den / post_div;
>+	fb_div = nom;
>+
>+	/* we're almost done, but reference and feedback
>+	   divider might be to big */
>+
>+	tmp = ref_div;
>+
>+        if (fb_div > fb_div_max) {
>+		ref_div = ref_div * fb_div_max / fb_div;
>+		fb_div = fb_div_max;
>+	}
>+
>+	if (ref_div > ref_div_max) {
>+		ref_div = ref_div_max;
>+		fb_div = nom * ref_div_max / tmp;
>+	}
> 
>+	/* and finally save the result */
> 	if (pll->flags & RADEON_PLL_USE_FRAC_FB_DIV) {
>-		avivo_get_fb_div(pll, target_clock, post_div, ref_div, &fb_div, &frac_fb_div);
>-		frac_fb_div = (100 * frac_fb_div) / pll->reference_freq;
>-		if (frac_fb_div >= 5) {
>-			frac_fb_div -= 5;
>-			frac_fb_div = frac_fb_div / 10;
>-			frac_fb_div++;
>-		}
>-		if (frac_fb_div >= 10) {
>-			fb_div++;
>-			frac_fb_div = 0;
>-		}
>+		*fb_div_p = fb_div / 10;
>+		*frac_fb_div_p = fb_div % 10;
> 	} else {
>-		while (ref_div <= pll->max_ref_div) {
>-			avivo_get_fb_div(pll, target_clock, post_div, ref_div,
>-					 &fb_div, &frac_fb_div);
>-			if (frac_fb_div >= (pll->reference_freq / 2))
>-				fb_div++;
>-			frac_fb_div = 0;
>-			tmp = (pll->reference_freq * fb_div) / (post_div * ref_div);
>-			tmp = (tmp * 10000) / target_clock;
>-
>-			if (tmp > (10000 + MAX_TOLERANCE))
>-				ref_div++;
>-			else if (tmp >= (10000 - MAX_TOLERANCE))
>-				break;
>-			else
>-				ref_div++;
>-		}
>+		*fb_div_p = fb_div;
>+		*frac_fb_div_p = 0;
> 	}
> 
>-	*dot_clock_p = ((pll->reference_freq * fb_div * 10) + (pll->reference_freq * frac_fb_div)) /
>-		(ref_div * post_div * 10);
>-	*fb_div_p = fb_div;
>-	*frac_fb_div_p = frac_fb_div;
>+	*dot_clock_p = ((pll->reference_freq * *fb_div_p * 10) +
>+			(pll->reference_freq * *frac_fb_div_p)) /
>+		       (ref_div * post_div * 10);
> 	*ref_div_p = ref_div;
> 	*post_div_p = post_div;
>-	DRM_DEBUG_KMS("%d, pll dividers - fb: %d.%d ref: %d, post %d\n",
>-		      *dot_clock_p, fb_div, frac_fb_div, ref_div, post_div);
>+	DRM_ERROR("%d, pll dividers - fb: %d.%d ref: %d, post %d\n",
>+		      *dot_clock_p, *fb_div_p, *frac_fb_div_p, ref_div, post_div);
> }
> 
> /* pre-avivo */
>-- 
>1.9.1
>

Actions: View | Splinter Review

Attachments on bug 76564: 96302 | 96303 | 96379 | 96380 | 96471 | 96473 | 96561 | 96562 | 96604 | 96792 | 96817 | 96819 | 96820 | 96869 | 96870 | 97901 | 98406 | 98407 | 98408 | 98409

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.