| From a10f0df0615abb194968fc08147f3cdd70fd5aa5 Mon Sep 17 00:00:00 2001 |
| From: Alex Deucher <alexander.deucher@amd.com> |
| Date: Tue, 26 May 2015 18:01:05 -0400 |
| Subject: drm/radeon: don't share plls if monitors differ in audio support |
| |
| From: Alex Deucher <alexander.deucher@amd.com> |
| |
| commit a10f0df0615abb194968fc08147f3cdd70fd5aa5 upstream. |
| |
| Enabling audio may enable different pll dividers. Don't share |
| plls if the monitors differ in audio support. |
| |
| bug: |
| https://bugzilla.kernel.org/show_bug.cgi?id=98751 |
| |
| 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 | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/gpu/drm/radeon/atombios_crtc.c |
| +++ b/drivers/gpu/drm/radeon/atombios_crtc.c |
| @@ -1789,7 +1789,9 @@ static int radeon_get_shared_nondp_ppll( |
| if ((crtc->mode.clock == test_crtc->mode.clock) && |
| (adjusted_clock == test_adjusted_clock) && |
| (radeon_crtc->ss_enabled == test_radeon_crtc->ss_enabled) && |
| - (test_radeon_crtc->pll_id != ATOM_PPLL_INVALID)) |
| + (test_radeon_crtc->pll_id != ATOM_PPLL_INVALID) && |
| + (drm_detect_monitor_audio(radeon_connector_edid(test_radeon_crtc->connector)) == |
| + drm_detect_monitor_audio(radeon_connector_edid(radeon_crtc->connector)))) |
| return test_radeon_crtc->pll_id; |
| } |
| } |
