From: Alex Deucher <alexdeuc...@gmail.com>
Date: Wed, 29 Sep 2010 11:37:40 -0400
commit f28488c282d8916b9b6190cc41714815bbaf97d5 upstream.
These shouldn't be needed with the post div changes
in the last patch.
Signed-off-by: Alex Deucher <alexdeuc...@gmail.com>
Signed-off-by: Dave Airlie <airl...@redhat.com>
Signed-off-by: Jonathan Nieder <jrnie...@gmail.com>
---
drivers/gpu/drm/radeon/atombios_crtc.c | 14 +-------------
drivers/gpu/drm/radeon/radeon_display.c | 26 ++------------------------
drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 5 -----
drivers/gpu/drm/radeon/radeon_mode.h | 12 +++---------
4 files changed, 6 insertions(+), 51 deletions(-)
diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c
b/drivers/gpu/drm/radeon/atombios_crtc.c
index af464e351fbd..2e8d899434a2 100644
--- a/drivers/gpu/drm/radeon/atombios_crtc.c
+++ b/drivers/gpu/drm/radeon/atombios_crtc.c
@@ -430,21 +430,9 @@ static u32 atombios_adjust_pll(struct drm_crtc *crtc,
(rdev->family == CHIP_RS740))
pll->flags |= (RADEON_PLL_USE_FRAC_FB_DIV |
RADEON_PLL_PREFER_CLOSEST_LOWER);
-
- if (ASIC_IS_DCE32(rdev) && mode->clock > 200000) /*
range limits??? */
- pll->flags |= RADEON_PLL_PREFER_HIGH_FB_DIV;
- else
- pll->flags |= RADEON_PLL_PREFER_LOW_REF_DIV;
- } else {
+ } else
pll->flags |= RADEON_PLL_LEGACY;
- if (mode->clock > 200000) /* range limits??? */
- pll->flags |= RADEON_PLL_PREFER_HIGH_FB_DIV;
- else
- pll->flags |= RADEON_PLL_PREFER_LOW_REF_DIV;
-
- }
-
list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
if (encoder->crtc == crtc) {
radeon_encoder = to_radeon_encoder(encoder);
diff --git a/drivers/gpu/drm/radeon/radeon_display.c
b/drivers/gpu/drm/radeon/radeon_display.c
index 60a51dced9d1..2252ab99a95c 100644
--- a/drivers/gpu/drm/radeon/radeon_display.c
+++ b/drivers/gpu/drm/radeon/radeon_display.c
@@ -530,7 +530,8 @@ void radeon_compute_pll(struct radeon_pll *pll,
if ((best_vco == 0 && error <
best_error) ||
(best_vco != 0 &&
((best_error > 100 && error <
best_error - 100) ||
- (abs(error - best_error) < 100 &&
vco_diff < best_vco_diff)))) {
+ (abs(error - best_error) < 100 &&
+ vco_diff < best_vco_diff)))) {
best_post_div = post_div;
best_ref_div = ref_div;
best_feedback_div =
feedback_div;
@@ -538,29 +539,6 @@ void radeon_compute_pll(struct radeon_pll *pll,
best_freq = current_freq;
best_error = error;
best_vco_diff = vco_diff;
- } else if (current_freq == freq) {
- if (best_freq == -1) {
- best_post_div =
post_div;
- best_ref_div = ref_div;
- best_feedback_div =
feedback_div;
- best_frac_feedback_div
= frac_feedback_div;
- best_freq =
current_freq;
- best_error = error;
- best_vco_diff =
vco_diff;
- } else if (((pll->flags &
RADEON_PLL_PREFER_LOW_REF_DIV) && (ref_div < best_ref_div)) ||
- ((pll->flags &
RADEON_PLL_PREFER_HIGH_REF_DIV) && (ref_div > best_ref_div)) ||
- ((pll->flags &
RADEON_PLL_PREFER_LOW_FB_DIV) && (feedback_div < best_feedback_div)) ||
- ((pll->flags &
RADEON_PLL_PREFER_HIGH_FB_DIV) && (feedback_div > best_feedback_div)) ||
- ((pll->flags &
RADEON_PLL_PREFER_LOW_POST_DIV) && (post_div < best_post_div)) ||
- ((pll->flags &
RADEON_PLL_PREFER_HIGH_POST_DIV) && (post_div > best_post_div))) {
- best_post_div =
post_div;
- best_ref_div = ref_div;
- best_feedback_div =
feedback_div;
- best_frac_feedback_div
= frac_feedback_div;
- best_freq =
current_freq;
- best_error = error;
- best_vco_diff =
vco_diff;
- }
}
if (current_freq < freq)
min_frac_feed_div =
frac_feedback_div + 1;
diff --git a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
index 272ddc741fb5..31224141ad5d 100644
--- a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
+++ b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
@@ -727,11 +727,6 @@ static void radeon_set_pll(struct drm_crtc *crtc, struct
drm_display_mode *mode)
pll->flags = RADEON_PLL_LEGACY;
- if (mode->clock > 200000) /* range limits??? */
- pll->flags |= RADEON_PLL_PREFER_HIGH_FB_DIV;
- else
- pll->flags |= RADEON_PLL_PREFER_LOW_REF_DIV;
-
list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
if (encoder->crtc == crtc) {
struct radeon_encoder *radeon_encoder =
to_radeon_encoder(encoder);
diff --git a/drivers/gpu/drm/radeon/radeon_mode.h
b/drivers/gpu/drm/radeon/radeon_mode.h
index e81b2aeb6a8f..0090a67ed363 100644
--- a/drivers/gpu/drm/radeon/radeon_mode.h
+++ b/drivers/gpu/drm/radeon/radeon_mode.h
@@ -117,15 +117,9 @@ struct radeon_tmds_pll {
#define RADEON_PLL_NO_ODD_POST_DIV (1 << 1)
#define RADEON_PLL_USE_REF_DIV (1 << 2)
#define RADEON_PLL_LEGACY (1 << 3)
-#define RADEON_PLL_PREFER_LOW_REF_DIV (1 << 4)
-#define RADEON_PLL_PREFER_HIGH_REF_DIV (1 << 5)
-#define RADEON_PLL_PREFER_LOW_FB_DIV (1 << 6)
-#define RADEON_PLL_PREFER_HIGH_FB_DIV (1 << 7)
-#define RADEON_PLL_PREFER_LOW_POST_DIV (1 << 8)
-#define RADEON_PLL_PREFER_HIGH_POST_DIV (1 << 9)
-#define RADEON_PLL_USE_FRAC_FB_DIV (1 << 10)
-#define RADEON_PLL_PREFER_CLOSEST_LOWER (1 << 11)
-#define RADEON_PLL_USE_POST_DIV (1 << 12)
+#define RADEON_PLL_USE_FRAC_FB_DIV (1 << 4)
+#define RADEON_PLL_PREFER_CLOSEST_LOWER (1 << 5)
+#define RADEON_PLL_USE_POST_DIV (1 << 6)
struct radeon_pll {
/* reference frequency */
--
1.7.6
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
