diff options
author | Dave Airlie <airlied@redhat.com> | 2010-10-18 20:36:47 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-10-19 00:12:22 -0400 |
commit | 5480f727dc4c049eb46b191bfaeb034067aa6835 (patch) | |
tree | d6b5166fd2e198e05de9027e0e61ebfb6abeb51f /drivers/gpu/drm/radeon/atombios_crtc.c | |
parent | c9220b0f7cbd1d2272426aa81a72ae2f6582bb71 (diff) |
Revert "drm/radeon/kms: remove some pll algo flags"
This reverts commit f28488c282d8916b9b6190cc41714815bbaf97d5.
On my rv610 test machine the monitor failed to light up after this.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/atombios_crtc.c')
-rw-r--r-- | drivers/gpu/drm/radeon/atombios_crtc.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c index 037e3260cb7c..176f424975ac 100644 --- a/drivers/gpu/drm/radeon/atombios_crtc.c +++ b/drivers/gpu/drm/radeon/atombios_crtc.c | |||
@@ -501,9 +501,21 @@ static u32 atombios_adjust_pll(struct drm_crtc *crtc, | |||
501 | (rdev->family == CHIP_RS740)) | 501 | (rdev->family == CHIP_RS740)) |
502 | pll->flags |= (/*RADEON_PLL_USE_FRAC_FB_DIV |*/ | 502 | pll->flags |= (/*RADEON_PLL_USE_FRAC_FB_DIV |*/ |
503 | RADEON_PLL_PREFER_CLOSEST_LOWER); | 503 | RADEON_PLL_PREFER_CLOSEST_LOWER); |
504 | } else | 504 | |
505 | if (ASIC_IS_DCE32(rdev) && mode->clock > 200000) /* range limits??? */ | ||
506 | pll->flags |= RADEON_PLL_PREFER_HIGH_FB_DIV; | ||
507 | else | ||
508 | pll->flags |= RADEON_PLL_PREFER_LOW_REF_DIV; | ||
509 | } else { | ||
505 | pll->flags |= RADEON_PLL_LEGACY; | 510 | pll->flags |= RADEON_PLL_LEGACY; |
506 | 511 | ||
512 | if (mode->clock > 200000) /* range limits??? */ | ||
513 | pll->flags |= RADEON_PLL_PREFER_HIGH_FB_DIV; | ||
514 | else | ||
515 | pll->flags |= RADEON_PLL_PREFER_LOW_REF_DIV; | ||
516 | |||
517 | } | ||
518 | |||
507 | list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) { | 519 | list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) { |
508 | if (encoder->crtc == crtc) { | 520 | if (encoder->crtc == crtc) { |
509 | radeon_encoder = to_radeon_encoder(encoder); | 521 | radeon_encoder = to_radeon_encoder(encoder); |