Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6fb3c025 authored by Alex Deucher's avatar Alex Deucher
Browse files

Revert "drm/radeon: don't share plls if monitors differ in audio support" 

This reverts commit a10f0df0.

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
parent 6dfd1972

drivers/gpu/drm/radeon/atombios_crtc.c

+1 −3
Original line number Diff line number Diff line
@@ -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;

		}

	}