From 504bb7bb146520809133f7f3d1277834ff908196 Mon Sep 17 00:00:00 2001
From: Jerome Glisse <jglisse@redhat.com>
Date: Wed, 26 Jan 2011 17:51:03 -0500
Subject: [PATCH] --- yaml --- r: 232511 b: refs/heads/master c:
 6bba2e116808ca12e30c8d88dfedabf8b8d67390 h: refs/heads/master i:   232509:
 38e749a26f1ffe71fe9eb15da13b695bc83d40ca   232507:
 d2b43f815c56ff68495d130b755a0ee42c943190   232503:
 515f1a3e44f5170522f4c1c13b3f515b9d8e2434   232495:
 b0a08a750508af7327662be2c2395617484c33f6   232479:
 a263fa230dd77084048e0500e7e27953abd9ad12   232447:
 c9e3efae039dad850c8117e4999ba1bb8fc467e6 v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/gpu/drm/radeon/atombios_dp.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e24f666f6d86..34a8d04f69df 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 52bb4a7391321b9f32c0b6e032d0a5e1796f1968
+refs/heads/master: 6bba2e116808ca12e30c8d88dfedabf8b8d67390
diff --git a/trunk/drivers/gpu/drm/radeon/atombios_dp.c b/trunk/drivers/gpu/drm/radeon/atombios_dp.c
index 4e7778d44b8d..695de9a38506 100644
--- a/trunk/drivers/gpu/drm/radeon/atombios_dp.c
+++ b/trunk/drivers/gpu/drm/radeon/atombios_dp.c
@@ -187,9 +187,9 @@ static int dp_link_clock_for_mode_clock(u8 dpcd[DP_DPCD_SIZE], int mode_clock)
 int dp_mode_valid(u8 dpcd[DP_DPCD_SIZE], int mode_clock)
 {
 	int lanes = dp_lanes_for_mode_clock(dpcd, mode_clock);
-	int bw = dp_lanes_for_mode_clock(dpcd, mode_clock);
+	int dp_clock = dp_link_clock_for_mode_clock(dpcd, mode_clock);
 
-	if ((lanes == 0) || (bw == 0))
+	if ((lanes == 0) || (dp_clock == 0))
 		return MODE_CLOCK_HIGH;
 
 	return MODE_OK;