Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fbedf1c3 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/radeon: KV has three PPLLs (v2) 



Enable all three in the driver.  Early documentation
indicated the 3rd one was used for something else, but
that is not the case.

v2: handle disable as well

Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent 2f6bd4da

drivers/gpu/drm/radeon/atombios_crtc.c

+4 −4
Original line number Diff line number Diff line
@@ -1851,10 +1851,9 @@ static int radeon_atom_pick_pll(struct drm_crtc *crtc) 
				return pll;

		}

		/* otherwise, pick one of the plls */

		if ((rdev->family == CHIP_KAVERI) ||

		    (rdev->family == CHIP_KABINI) ||

		if ((rdev->family == CHIP_KABINI) ||

		    (rdev->family == CHIP_MULLINS)) {

			/* KB/KV/ML has PPLL1 and PPLL2 */

			/* KB/ML has PPLL1 and PPLL2 */

			pll_in_use = radeon_get_pll_use_mask(crtc);

			if (!(pll_in_use & (1 << ATOM_PPLL2)))

				return ATOM_PPLL2;
@@ -1863,7 +1862,7 @@ static int radeon_atom_pick_pll(struct drm_crtc *crtc) 
			DRM_ERROR("unable to allocate a PPLL\n");

			return ATOM_PPLL_INVALID;

		} else {

			/* CI has PPLL0, PPLL1, and PPLL2 */

			/* CI/KV has PPLL0, PPLL1, and PPLL2 */

			pll_in_use = radeon_get_pll_use_mask(crtc);

			if (!(pll_in_use & (1 << ATOM_PPLL2)))

				return ATOM_PPLL2;
@@ -2155,6 +2154,7 @@ static void atombios_crtc_disable(struct drm_crtc *crtc) 
	case ATOM_PPLL0:

		/* disable the ppll */

		if ((rdev->family == CHIP_ARUBA) ||

		    (rdev->family == CHIP_KAVERI) ||

		    (rdev->family == CHIP_BONAIRE) ||

		    (rdev->family == CHIP_HAWAII))

			atombios_crtc_program_pll(crtc, radeon_crtc->crtc_id, radeon_crtc->pll_id,