Attachment 39931 Details for Bug 18564 – fix

[patch] fix

0001-drm-radeon-kms-don-t-disable-shared-encoders-on-pre-.patch (text/plain), 2.07 KB, created by Alex Deucher on 2010-10-31 15:20:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2010-10-31 15:20:46 UTC

Size: 2.07 KB

patch

obsolete

>From 53d4ccdc3d74121757ee950914447e580e32c406 Mon Sep 17 00:00:00 2001
>From: Alex Deucher <alexdeucher@gmail.com>
>Date: Sun, 31 Oct 2010 18:15:32 -0400
>Subject: [PATCH] drm/radeon/kms: don't disable shared encoders on pre-DCE3 display blocks
>
>The A/B links aren't independantly useable on these blocks so when
>we disable the encoders, make sure to only disable the encoder when
>there is no connector using it.
>
>Should fix:
>https://bugs.freedesktop.org/show_bug.cgi?id=18564
>
>Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
>Cc: stable@kernel.org
>---
> drivers/gpu/drm/radeon/radeon_encoders.c |   18 ++++++++++++++++++
> 1 files changed, 18 insertions(+), 0 deletions(-)
>
>diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c
>index ae58b68..b862be6 100644
>--- a/drivers/gpu/drm/radeon/radeon_encoders.c
>+++ b/drivers/gpu/drm/radeon/radeon_encoders.c
>@@ -1547,6 +1547,23 @@ static void radeon_atom_encoder_disable(struct drm_encoder *encoder)
> 	struct radeon_device *rdev = dev->dev_private;
> 	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
> 	struct radeon_encoder_atom_dig *dig;
>+
>+	/* check for pre-DCE3 cards with shared encoders;
>+	 * can't really use the links individually, so don't disable
>+	 * the encoder if it's in use by another connector
>+	 */
>+	if (!ASIC_IS_DCE3(rdev)) {
>+		struct drm_encoder *other_encoder;
>+		struct radeon_encoder *other_radeon_encoder;
>+
>+		list_for_each_entry(other_encoder, &dev->mode_config.encoder_list, head) {
>+			other_radeon_encoder = to_radeon_encoder(other_encoder);
>+			if ((radeon_encoder->encoder_id == other_radeon_encoder->encoder_id) &&
>+			    drm_helper_encoder_in_use(other_encoder))
>+				goto disable_done;
>+		}
>+	}
>+
> 	radeon_atom_encoder_dpms(encoder, DRM_MODE_DPMS_OFF);
> 
> 	switch (radeon_encoder->encoder_id) {
>@@ -1586,6 +1603,7 @@ static void radeon_atom_encoder_disable(struct drm_encoder *encoder)
> 		break;
> 	}
> 
>+disable_done:
> 	if (radeon_encoder_is_digital(encoder)) {
> 		if (atombios_get_encoder_mode(encoder) == ATOM_ENCODER_MODE_HDMI)
> 			r600_hdmi_disable(encoder);
>-- 
>1.7.1.1
>

Actions: View | Splinter Review

Attachments on bug 18564: 20354 | 20355 | 20356 | 20357 | 21623 | 21644 | 21694 | 21810 | 27629 | 31945 | 39925 | 39927 | 39928 | 39929 | 39931

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.