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

Patch "Revert "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

    Revert "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:
     revert-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 6fb3c025fee16f11ebd73f84f5aba1ee9ce7f8c6 Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexander.deucher@amd.com>
Date: Wed, 10 Jun 2015 01:29:14 -0400
Subject: Revert "drm/radeon: don't share plls if monitors differ in audio support"

From: Alex Deucher <alexander.deucher@amd.com>

commit 6fb3c025fee16f11ebd73f84f5aba1ee9ce7f8c6 upstream.

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

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 drivers/gpu/drm/radeon/atombios_crtc.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- a/drivers/gpu/drm/radeon/atombios_crtc.c
+++ b/drivers/gpu/drm/radeon/atombios_crtc.c
@@ -1789,9 +1789,7 @@ 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) &&
-			    (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;
 		}
 	}


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

queue-4.0/drm-radeon-fix-freeze-for-laptop-with-turks-thames-gpu.patch
queue-4.0/revert-drm-radeon-adjust-pll-when-audio-is-not-enabled.patch
queue-4.0/drm-radeon-use-proper-acr-regisiter-for-dce3.2.patch
queue-4.0/drm-radeon-make-sure-radeon_vm_bo_set_addr-always-unreserves-the-bo.patch
queue-4.0/revert-drm-radeon-don-t-share-plls-if-monitors-differ-in-audio-support.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in