From 9e514bc2f8848c0cc3aabb4c6bac2abe3c2438e3 Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexdeucher@gmail.com>
Date: Mon, 14 Feb 2011 11:43:10 -0500
Subject: [PATCH] --- yaml --- r: 233343 b: refs/heads/master c:
 a4b40d5d97f5c9ad0b7f4bf2818291ca184bb433 h: refs/heads/master i:   233341:
 cc1a130937c236442da0910f84cb31a85d69201e   233339:
 5053b6efd70d10ed99d4f0ea99b2cbdd70cfea1d   233335:
 d0542967215c769f38a6ae02a1b9ae697e5732bd   233327:
 881961f7c44893e6a7be1b27f375b81766038a79   233311:
 939e60f526bfda7cfc31e261ddfd31d5191fe402   233279:
 44f0aa910de9bbb0a280bf5d90677de8ad5769f0   233215:
 aee49e238ff6655936a0d52d12800afa667474bf v: v3

---
 [refs]                                        |  2 +-
 trunk/drivers/gpu/drm/radeon/radeon_display.c | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 33695f7109bc..80601a812421 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bd91572e77013aad242e2d2d565bd730c043f8b8
+refs/heads/master: a4b40d5d97f5c9ad0b7f4bf2818291ca184bb433
diff --git a/trunk/drivers/gpu/drm/radeon/radeon_display.c b/trunk/drivers/gpu/drm/radeon/radeon_display.c
index 2eff98cfd728..0e657095de7c 100644
--- a/trunk/drivers/gpu/drm/radeon/radeon_display.c
+++ b/trunk/drivers/gpu/drm/radeon/radeon_display.c
@@ -793,6 +793,11 @@ static void avivo_get_fb_div(struct radeon_pll *pll,
 	tmp *= target_clock;
 	*fb_div = tmp / pll->reference_freq;
 	*frac_fb_div = tmp % pll->reference_freq;
+
+        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;
 }
 
 static u32 avivo_get_post_div(struct radeon_pll *pll,
@@ -826,6 +831,11 @@ static u32 avivo_get_post_div(struct radeon_pll *pll,
 			post_div--;
 	}
 
+	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;
+
 	return post_div;
 }