summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2016-08-18 11:51:14 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-09-15 08:20:26 +0200
commit792a5bf09a19f0ef30a55e32ad1a93c8f0612759 (patch)
tree33c35d0dc2e9401b7a48dbb26b9904c3330eb261
parent952cbbb0fcccdf22c98e18c94ec1ad849537e33a (diff)
downloadlinux-stable-792a5bf09a19f0ef30a55e32ad1a93c8f0612759.tar.gz
linux-stable-792a5bf09a19f0ef30a55e32ad1a93c8f0612759.tar.bz2
linux-stable-792a5bf09a19f0ef30a55e32ad1a93c8f0612759.zip
drm/radeon: only apply the SS fractional workaround to RS[78]80
commit ae5b80d2b68eac945b124227dea34462118a6f01 upstream. Looks like some RV6xx have problems with that. bug: https://bugs.freedesktop.org/show_bug.cgi?id=97099 Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/gpu/drm/radeon/atombios_crtc.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c
index 259cd6e6d71c..17e34546ade2 100644
--- a/drivers/gpu/drm/radeon/atombios_crtc.c
+++ b/drivers/gpu/drm/radeon/atombios_crtc.c
@@ -627,7 +627,9 @@ static u32 atombios_adjust_pll(struct drm_crtc *crtc,
if (radeon_crtc->ss.refdiv) {
radeon_crtc->pll_flags |= RADEON_PLL_USE_REF_DIV;
radeon_crtc->pll_reference_div = radeon_crtc->ss.refdiv;
- if (rdev->family >= CHIP_RV770)
+ if (ASIC_IS_AVIVO(rdev) &&
+ rdev->family != CHIP_RS780 &&
+ rdev->family != CHIP_RS880)
radeon_crtc->pll_flags |= RADEON_PLL_USE_FRAC_FB_DIV;
}
}