diff options
| author |   Samuel Li <samuel.li@amd.com> | 2014-04-30 18:40:53 -0400 |
|---|---|---|
| committer |   Christian König <christian.koenig@amd.com> | 2014-05-06 12:20:04 +0200 |
| commit | b214f2a4ba415dcad40fcc7c195d0a402f8211de (patch) | |
| tree | eb6976a741b9d30c39599972bd35d72ad6201985 | |
| parent | drm/radeon: dpm updates for KV/KB (diff) | |
| download | linux-dev-b214f2a4ba415dcad40fcc7c195d0a402f8211de.tar.xz linux-dev-b214f2a4ba415dcad40fcc7c195d0a402f8211de.zip | |
drm/radeon: modesetting updates for Mullins.
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>
| -rw-r--r-- | drivers/gpu/drm/radeon/atombios_crtc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c index b7983aaee445..c31c12b4e666 100644 --- a/drivers/gpu/drm/radeon/atombios_crtc.c +++ b/drivers/gpu/drm/radeon/atombios_crtc.c @@ -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; |