]> Pileus Git - ~andy/linux/commitdiff
drm/radeon: don't share PPLLs on DCE4.1
authorAlex Deucher <alexander.deucher@amd.com>
Thu, 31 Oct 2013 20:43:27 +0000 (16:43 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 1 Nov 2013 19:25:55 +0000 (15:25 -0400)
Sharing PPLLs seems to cause problems on some boards.

Bug:
https://bugs.freedesktop.org/show_bug.cgi?id=45334

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
drivers/gpu/drm/radeon/atombios_crtc.c

index bf87f6d435f81ed4f482bbc99dfeb220fdc6d8dd..86d9ee08b13f8266e8a43e5c32a7a66f8e639aea 100644 (file)
@@ -1753,7 +1753,7 @@ static int radeon_atom_pick_pll(struct drm_crtc *crtc)
                                if (pll != ATOM_PPLL_INVALID)
                                        return pll;
                        }
-               } else {
+               } else if (!ASIC_IS_DCE41(rdev)) { /* Don't share PLLs on DCE4.1 chips */
                        /* use the same PPLL for all monitors with the same clock */
                        pll = radeon_get_shared_nondp_ppll(crtc);
                        if (pll != ATOM_PPLL_INVALID)