[1/2] drm/radeon: don't disable plls that are in use by other crtcs

Commit Message

Alex Deucher Aug. 24, 2012, 7:37 p.m. UTC

From: Alex Deucher <[e-mail]>

Some plls are shared for DP.

Signed-off-by: Alex Deucher <[e-mail]>
Cc: [e-mail]
---
 drivers/gpu/drm/radeon/atombios_crtc.c |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

Comments

Michel Dänzer Aug. 27, 2012, 10:24 a.m. UTC | #1

On Fre, 2012-08-24 at 15:37 -0400, [e-mail] wrote: 
> From: Alex Deucher <[e-mail]>
> 
> Some plls are shared for DP.
> 
> Signed-off-by: Alex Deucher <[e-mail]>

Reviewed-by: Michel Dänzer <[e-mail]>

Patch

diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c
index bcc5cd3..6b274ff 100644
--- a/drivers/gpu/drm/radeon/atombios_crtc.c
+++ b/drivers/gpu/drm/radeon/atombios_crtc.c
@@ -1722,9 +1722,22 @@  static void atombios_crtc_disable(struct drm_crtc *crtc)
 	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:
@@ -1741,6 +1754,7 @@  static void atombios_crtc_disable(struct drm_crtc *crtc)
 	default:
 		break;
 	}
+done:
 	radeon_crtc->pll_id = -1;
 }