This is a note to let you know that I've just added the patch titled
drm/radeon: don't disable plls that are in use by other crtcs
to the 3.4-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-disable-plls-that-are-in-use-by-other-crtcs.patch
and it can be found in the queue-3.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From 4e58591c8961b3e31709313f75819f2eec06e322 Mon Sep 17 00:00:00 2001
From: Alex Deucher <[email protected]>
Date: Tue, 21 Aug 2012 19:06:21 -0400
Subject: drm/radeon: don't disable plls that are in use by other crtcs
From: Alex Deucher <[email protected]>
commit 4e58591c8961b3e31709313f75819f2eec06e322 upstream.
Some plls are shared for DP.
Signed-off-by: Alex Deucher <[email protected]>
Reviewed-by: Michel Dänzer <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/gpu/drm/radeon/atombios_crtc.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
--- a/drivers/gpu/drm/radeon/atombios_crtc.c
+++ b/drivers/gpu/drm/radeon/atombios_crtc.c
@@ -1663,9 +1663,22 @@ static void atombios_crtc_disable(struct
struct drm_device *dev = crtc->dev;
struct radeon_device *rdev = dev->dev_private;
struct radeon_atom_ss ss;
+ int i;
atombios_crtc_dpms(crtc, DRM_MODE_DPMS_OFF);
+ for (i = 0; i < rdev->num_crtc; i++) {
+ if (rdev->mode_info.crtcs[i] &&
+ rdev->mode_info.crtcs[i]->enabled &&
+ i != radeon_crtc->crtc_id &&
+ radeon_crtc->pll_id == rdev->mode_info.crtcs[i]->pll_id) {
+ /* one other crtc is using this pll don't turn
+ * off the pll
+ */
+ goto done;
+ }
+ }
+
switch (radeon_crtc->pll_id) {
case ATOM_PPLL1:
case ATOM_PPLL2:
@@ -1682,6 +1695,7 @@ static void atombios_crtc_disable(struct
default:
break;
}
+done:
radeon_crtc->pll_id = -1;
}
Patches currently in stable-queue which might be from [email protected]
are
queue-3.4/drm-radeon-implement-acpi-vfct-vbios-fetch-v3.patch
queue-3.4/drm-radeon-atom-rework-dig-modesetting-on-dce3.patch
queue-3.4/drm-radeon-split-atrm-support-out-from-the-atpx-handler-v3.patch
queue-3.4/drm-radeon-convert-radeon-vfct-code-to-use-acpi_get_table_with_size.patch
queue-3.4/drm-radeon-force-dma32-to-fix-regression-rs4xx-rs6xx-rs740.patch
queue-3.4/drm-radeon-don-t-disable-plls-that-are-in-use-by-other-crtcs.patch
queue-3.4/drm-radeon-avoid-turning-off-spread-spectrum-for-used-pll.patch
queue-3.4/drm-radeon-ss-use-num_crtc-rather-than-hardcoded-6.patch
queue-3.4/drm-radeon-fix-dig-encoder-selection-on-dce61.patch
queue-3.4/drm-radeon-kms-extend-the-fujitsu-d3003-s2-board-connector-quirk-to-cover-later-silicon-stepping.patch
queue-3.4/drm-radeon-atom-powergating-fixes-for-dce6.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
