| From fbedf1c3fc3a1e9f249c2efe2f4553d8df9d86d3 Mon Sep 17 00:00:00 2001 |
| From: Alex Deucher <alexander.deucher@amd.com> |
| Date: Fri, 5 Dec 2014 13:46:07 -0500 |
| Subject: drm/radeon: KV has three PPLLs (v2) |
| |
| From: Alex Deucher <alexander.deucher@amd.com> |
| |
| commit fbedf1c3fc3a1e9f249c2efe2f4553d8df9d86d3 upstream. |
| |
| 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: Alex Deucher <alexander.deucher@amd.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/gpu/drm/radeon/atombios_crtc.c | 8 ++++---- |
| 1 file changed, 4 insertions(+), 4 deletions(-) |
| |
| --- a/drivers/gpu/drm/radeon/atombios_crtc.c |
| +++ b/drivers/gpu/drm/radeon/atombios_crtc.c |
| @@ -1851,10 +1851,9 @@ static int radeon_atom_pick_pll(struct d |
| 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 d |
| 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; |
| @@ -2154,6 +2153,7 @@ static void atombios_crtc_disable(struct |
| 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, |
