Patch "drm/radeon: don't share plls if monitors differ in audio support" has been added to the 4.0-stable tree

Patch "drm/radeon: don't share plls if monitors differ in audio support" has been added to the 4.0-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

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

to the 4.0-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     drm-radeon-don-t-share-plls-if-monitors-differ-in-audio-support.patch
and it can be found in the queue-4.0 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


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


Patches currently in stable-queue which might be from alexander.deucher@amd.com are

queue-4.0/drm-radeon-partially-revert-fix-vm_context-_page_table_end_addr-handling.patch
queue-4.0/drm-radeon-don-t-share-plls-if-monitors-differ-in-audio-support.patch
queue-4.0/drm-radeon-audio-make-sure-connector-is-valid-in-hotplug-case.patch
queue-4.0/drm-radeon-fix-vm_context-_page_table_end_addr-handling.patch
queue-4.0/drm-radeon-add-new-bonaire-pci-id.patch
queue-4.0/revert-drm-radeon-only-mark-audio-as-connected-if-the-monitor-supports-it-v3.patch
queue-4.0/drm-amdkfd-don-t-report-local-memory-size.patch
queue-4.0/drm-radeon-retry-dcpd-fetch.patch