From 26ef5414300767765c81b76f4970b5adfc7fec5b Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexander.deucher@amd.com>
Date: Wed, 12 Oct 2011 18:44:32 -0400
Subject: [PATCH] --- yaml --- r: 264363 b: refs/heads/master c:
 3a6dea31453a101bd5e9e9c89a79f4fcb6b0342e h: refs/heads/master i:   264361:
 394990fb292fd4031572cbd124a56d36b9688a9c   264359:
 0589256d609160e6d428a31085aca9aaa4268bcd v: v3

---
 [refs]                                         |  2 +-
 trunk/drivers/gpu/drm/radeon/radeon_encoders.c | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index e402b0805879..ea8df85adf36 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e22469ca88a8f1f6fe47adbf5e5ce0906aec07cd
+refs/heads/master: 3a6dea31453a101bd5e9e9c89a79f4fcb6b0342e
diff --git a/trunk/drivers/gpu/drm/radeon/radeon_encoders.c b/trunk/drivers/gpu/drm/radeon/radeon_encoders.c
index 8a171b21b453..a90d9eeb96a3 100644
--- a/trunk/drivers/gpu/drm/radeon/radeon_encoders.c
+++ b/trunk/drivers/gpu/drm/radeon/radeon_encoders.c
@@ -1756,10 +1756,15 @@ static int radeon_atom_pick_dig_encoder(struct drm_encoder *encoder)
 	if (ASIC_IS_DCE4(rdev)) {
 		dig = radeon_encoder->enc_priv;
 		if (ASIC_IS_DCE41(rdev)) {
-			if (dig->linkb)
-				return 1;
-			else
-				return 0;
+			/* ontario follows DCE4 */
+			if (rdev->family == CHIP_PALM) {
+				if (dig->linkb)
+					return 1;
+				else
+					return 0;
+			} else
+				/* llano follows DCE3.2 */
+				return radeon_crtc->crtc_id;
 		} else {
 			switch (radeon_encoder->encoder_id) {
 			case ENCODER_OBJECT_ID_INTERNAL_UNIPHY: