From 6fe6417a4e31b8739b622b8369e0fac661bd7c9e Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexander.deucher@amd.com>
Date: Mon, 6 Aug 2012 17:06:03 -0400
Subject: [PATCH] --- yaml --- r: 321631 b: refs/heads/master c:
 ecd67955fd4c8e66e4df312098989d5fa7da624c h: refs/heads/master i:   321629:
 4a5bcc65e038145fd639c45e1939f2e8d23b15be   321627:
 e2143774f71be3ea7990671fd67fa3d680a7d912   321623:
 de6fb6ea367640e960539936a7f05c264ad5936e   321615:
 ac636c5f62a39c75f818eec8d89a549031cf49dd   321599:
 96bd6f1bfb3f4177a05e05959bc4da72095bd1cd v: v3

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

diff --git a/[refs] b/[refs]
index 7f450abc01a7..91ae3e2ece8f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 81ee8fb6b52ec69eeed37fe7943446af1dccecc5
+refs/heads/master: ecd67955fd4c8e66e4df312098989d5fa7da624c
diff --git a/trunk/drivers/gpu/drm/radeon/atombios_crtc.c b/trunk/drivers/gpu/drm/radeon/atombios_crtc.c
index dc279ebf7afb..c6fcb5b86a45 100644
--- a/trunk/drivers/gpu/drm/radeon/atombios_crtc.c
+++ b/trunk/drivers/gpu/drm/radeon/atombios_crtc.c
@@ -1531,12 +1531,12 @@ static int radeon_atom_pick_pll(struct drm_crtc *crtc)
 				 * crtc virtual pixel clock.
 				 */
 				if (ENCODER_MODE_IS_DP(atombios_get_encoder_mode(test_encoder))) {
-					if (ASIC_IS_DCE5(rdev))
-						return ATOM_DCPLL;
+					if (rdev->clock.dp_extclk)
+						return ATOM_PPLL_INVALID;
 					else if (ASIC_IS_DCE6(rdev))
 						return ATOM_PPLL0;
-					else if (rdev->clock.dp_extclk)
-						return ATOM_PPLL_INVALID;
+					else if (ASIC_IS_DCE5(rdev))
+						return ATOM_DCPLL;
 				}
 			}
 		}