diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2015-06-10 07:29:14 +0200 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2015-06-11 16:26:48 +0200 |
| commit | 6fb3c025fee16f11ebd73f84f5aba1ee9ce7f8c6 (patch) | |
| tree | fc501be4a600a71900e53d385ad5f40800d2ed5c /drivers/gpu | |
| parent | drm/radeon: fix freeze for laptop with Turks/Thames GPU. (diff) | |
| download | linux-6fb3c025fee16f11ebd73f84f5aba1ee9ce7f8c6.tar.xz linux-6fb3c025fee16f11ebd73f84f5aba1ee9ce7f8c6.zip | |
Revert "drm/radeon: don't share plls if monitors differ in audio support"
This reverts commit a10f0df0615abb194968fc08147f3cdd70fd5aa5.
Fixes some systems at the expense of others. Need to properly
fix the pll divider selection.
bug:
https://bugzilla.kernel.org/show_bug.cgi?id=99651
Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/radeon/atombios_crtc.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c index e597ffc26563..42b2ea3fdcf3 100644 --- a/drivers/gpu/drm/radeon/atombios_crtc.c +++ b/drivers/gpu/drm/radeon/atombios_crtc.c @@ -1798,9 +1798,7 @@ static int radeon_get_shared_nondp_ppll(struct drm_crtc *crtc) 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) && - (drm_detect_monitor_audio(radeon_connector_edid(test_radeon_crtc->connector)) == - drm_detect_monitor_audio(radeon_connector_edid(radeon_crtc->connector)))) + (test_radeon_crtc->pll_id != ATOM_PPLL_INVALID)) return test_radeon_crtc->pll_id; } } |