drm/radeon: modesetting updates for Mullins.
authorSamuel Li <samuel.li@amd.com>
Wed, 30 Apr 2014 22:40:53 +0000 (18:40 -0400)
committerChristian König <christian.koenig@amd.com>
Tue, 6 May 2014 10:20:04 +0000 (12:20 +0200)
Uses the same code as Kabini.

Signed-off-by: Samuel Li <samuel.li@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Christian König <christian.koenig@amd.com>
drivers/gpu/drm/radeon/atombios_crtc.c

index b7983aaee44560a290fa8af6352d7411ad8b3302..c31c12b4e66681614f0d294e4fd0a0cf19350c88 100644 (file)
@@ -1736,8 +1736,9 @@ static int radeon_atom_pick_pll(struct drm_crtc *crtc)
                }
                /* otherwise, pick one of the plls */
                if ((rdev->family == CHIP_KAVERI) ||
-                   (rdev->family == CHIP_KABINI)) {
-                       /* KB/KV has PPLL1 and PPLL2 */
+                   (rdev->family == CHIP_KABINI) ||
+                   (rdev->family == CHIP_MULLINS)) {
+                       /* KB/KV/ML has PPLL1 and PPLL2 */
                        pll_in_use = radeon_get_pll_use_mask(crtc);
                        if (!(pll_in_use & (1 << ATOM_PPLL2)))
                                return ATOM_PPLL2;