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

Commit 6be00fc7 authored by Alex Deucher's avatar Alex Deucher Committed by Sasha Levin
Browse files

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

[ Upstream commit a10f0df0615abb194968fc08147f3cdd70fd5aa5 ]

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: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent 33c2de6b

drivers/gpu/drm/radeon/atombios_crtc.c

+3 −1
Original line number Diff line number Diff line
@@ -1789,7 +1789,9 @@ 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))

			    (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;

		}

	}