---

yaml --- r: 274991 b: refs/heads/master c: fdca78c h: refs/heads/master i: 274989: 51c9c2c 274987: 757cb89 274983: 5bea0c6 274975: 4094a32 v: v3
git-mirror · Nov 1, 2011 · ef14939 · ef14939
1 parent 07f1906
commit ef14939
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d33e1fc8dcce667a70387b666a8b6f60153d90f
+refs/heads/master: fdca78c3b8876e47f1c92b3b28693b261bfd913a
diff --git a/trunk/drivers/gpu/drm/radeon/atombios_dp.c b/trunk/drivers/gpu/drm/radeon/atombios_dp.c
@@ -482,8 +482,8 @@ static int radeon_dp_get_dp_link_clock(struct drm_connector *connector,
 	int bpp = convert_bpc_to_bpp(connector->display_info.bpc);
 	int lane_num, max_pix_clock;
 
-	if (radeon_connector_encoder_get_dp_bridge_encoder_id(connector) !=
-	    ENCODER_OBJECT_ID_NONE)
+	if (radeon_connector_encoder_get_dp_bridge_encoder_id(connector) ==
+	    ENCODER_OBJECT_ID_NUTMEG)
 		return 270000;
 
 	lane_num = radeon_dp_get_dp_lane_number(connector, dpcd, pix_clock);