diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2011-04-19 15:24:59 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-04-19 19:39:37 -0400 |
| commit | 5785e53ffa73f77fb19e378c899027afc07272bc (patch) | |
| tree | 0789a942d7416201ad64976b8d93a7db6f352b5d /drivers/gpu | |
| parent | be761d5ebd2712985c94086cb2d9f4ba6aed556d (diff) | |
drm/radeon/kms: pll tweaks for r7xx
Prefer min m to max p only on pre-r7xx asics.
Fixes:
https://bugs.freedesktop.org/show_bug.cgi?id=36197
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Cc: stable@kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/radeon/atombios_crtc.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c index 9d516a8c4dfa..529a3a704731 100644 --- a/drivers/gpu/drm/radeon/atombios_crtc.c +++ b/drivers/gpu/drm/radeon/atombios_crtc.c | |||
| @@ -532,10 +532,7 @@ static u32 atombios_adjust_pll(struct drm_crtc *crtc, | |||
| 532 | else | 532 | else |
| 533 | pll->flags |= RADEON_PLL_PREFER_LOW_REF_DIV; | 533 | pll->flags |= RADEON_PLL_PREFER_LOW_REF_DIV; |
| 534 | 534 | ||
| 535 | if ((rdev->family == CHIP_R600) || | 535 | if (rdev->family < CHIP_RV770) |
| 536 | (rdev->family == CHIP_RV610) || | ||
| 537 | (rdev->family == CHIP_RV630) || | ||
| 538 | (rdev->family == CHIP_RV670)) | ||
| 539 | pll->flags |= RADEON_PLL_PREFER_MINM_OVER_MAXP; | 536 | pll->flags |= RADEON_PLL_PREFER_MINM_OVER_MAXP; |
| 540 | } else { | 537 | } else { |
| 541 | pll->flags |= RADEON_PLL_LEGACY; | 538 | pll->flags |= RADEON_PLL_LEGACY; |
| @@ -565,7 +562,6 @@ static u32 atombios_adjust_pll(struct drm_crtc *crtc, | |||
| 565 | if (radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) { | 562 | if (radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) { |
| 566 | if (ss_enabled) { | 563 | if (ss_enabled) { |
| 567 | if (ss->refdiv) { | 564 | if (ss->refdiv) { |
| 568 | pll->flags |= RADEON_PLL_PREFER_MINM_OVER_MAXP; | ||
| 569 | pll->flags |= RADEON_PLL_USE_REF_DIV; | 565 | pll->flags |= RADEON_PLL_USE_REF_DIV; |
| 570 | pll->reference_div = ss->refdiv; | 566 | pll->reference_div = ss->refdiv; |
| 571 | if (ASIC_IS_AVIVO(rdev)) | 567 | if (ASIC_IS_AVIVO(rdev)) |