From ef149397dd0bcedfa261720c715eed3376588bc4 Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Tue, 25 Oct 2011 11:54:52 -0400 Subject: [PATCH] --- yaml --- r: 274991 b: refs/heads/master c: fdca78c3b8876e47f1c92b3b28693b261bfd913a h: refs/heads/master i: 274989: 51c9c2c37a6c32ca69804e3cc65d8f2e709afb92 274987: 757cb898416bc801eff967de22161dc4860c8498 274983: 5bea0c6d1217841789351660c5529483f0c0c328 274975: 4094a3288bdf695d5daf1e6f2b5346994ee5a818 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 3a4bd45de499..6254d2d8ed66 100644 --- 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 index d0ef4cbadfa4..ff47186b5629 100644 --- 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);