---

yaml --- r: 321631 b: refs/heads/master c: ecd6795 h: refs/heads/master i: 321629: 4a5bcc6 321627: e214377 321623: de6fb6e 321615: ac636c5 321599: 96bd6f1 v: v3
git-mirror · Aug 13, 2012 · 6fe6417 · 6fe6417
1 parent 4e839f7
commit 6fe6417
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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;
 				}
 			}
 		}