summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2011-10-25 11:54:52 -0400
committerDave Airlie <airlied@redhat.com>2011-11-01 16:04:44 +0000
commitfdca78c3b8876e47f1c92b3b28693b261bfd913a (patch)
treebc54335ecb49a7b0715f6692e6bf1f1a8fd9aca8
parent1d33e1fc8dcce667a70387b666a8b6f60153d90f (diff)
downloadlinux-3.10-fdca78c3b8876e47f1c92b3b28693b261bfd913a.tar.gz
linux-3.10-fdca78c3b8876e47f1c92b3b28693b261bfd913a.tar.bz2
linux-3.10-fdca78c3b8876e47f1c92b3b28693b261bfd913a.zip
drm/radeon/kms: only require 2.7 Ghz DP clock for NUTMEG
Use the regular logic for other bridge chips. Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--drivers/gpu/drm/radeon/atombios_dp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/atombios_dp.c b/drivers/gpu/drm/radeon/atombios_dp.c
index d0ef4cbadfa..ff47186b562 100644
--- a/drivers/gpu/drm/radeon/atombios_dp.c
+++ b/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);