diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2013-10-31 16:43:27 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-04 13:57:14 -0500 |
| commit | ed540279a8af2c4005430303f74df05ca5576879 (patch) | |
| tree | 3f0394127dc63afa785390baed0c522389ec95fb /drivers/gpu | |
| parent | 08ab0aac9ec2d6c07acb6bd96f3e9e872b3dfbaf (diff) | |
drm/radeon: don't share PPLLs on DCE4.1
commit 70471860ff9f335c60c004d42ebd48945bfa5403 upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/radeon/atombios_crtc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c index d5df8fd10217..22f06c8d8e0b 100644 --- a/drivers/gpu/drm/radeon/atombios_crtc.c +++ b/drivers/gpu/drm/radeon/atombios_crtc.c | |||
| @@ -1683,7 +1683,7 @@ static int radeon_atom_pick_pll(struct drm_crtc *crtc) | |||
| 1683 | if (pll != ATOM_PPLL_INVALID) | 1683 | if (pll != ATOM_PPLL_INVALID) |
| 1684 | return pll; | 1684 | return pll; |
| 1685 | } | 1685 | } |
| 1686 | } else { | 1686 | } else if (!ASIC_IS_DCE41(rdev)) { /* Don't share PLLs on DCE4.1 chips */ |
| 1687 | /* use the same PPLL for all monitors with the same clock */ | 1687 | /* use the same PPLL for all monitors with the same clock */ |
| 1688 | pll = radeon_get_shared_nondp_ppll(crtc); | 1688 | pll = radeon_get_shared_nondp_ppll(crtc); |
| 1689 | if (pll != ATOM_PPLL_INVALID) | 1689 | if (pll != ATOM_PPLL_INVALID) |