summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2014-03-06 18:09:52 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-03-23 21:37:06 -0700
commit7dab50632efb9ed42ee352c3588a3e107dff66bb (patch)
treecf7714a92bf1a47bc9327b4f760d5f710b45e67c
parentbfe635e52ede4c72819099b0fce72e28eec6e6c6 (diff)
downloadkernel-common-7dab50632efb9ed42ee352c3588a3e107dff66bb.tar.gz
kernel-common-7dab50632efb9ed42ee352c3588a3e107dff66bb.tar.bz2
kernel-common-7dab50632efb9ed42ee352c3588a3e107dff66bb.zip
drm/radeon/atom: select the proper number of lanes in transmitter setup
commit d03874c881a049a50e12f285077ab1f9fc2686e1 upstream. We need to check for DVI vs. HDMI when setting up duallink since HDMI is single link only. Fixes 4k modes on newer asics. bug: https://bugs.freedesktop.org/show_bug.cgi?id=75223 Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/gpu/drm/radeon/atombios_encoders.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/atombios_encoders.c b/drivers/gpu/drm/radeon/atombios_encoders.c
index 6f4627fe24a1..072229dca464 100644
--- a/drivers/gpu/drm/radeon/atombios_encoders.c
+++ b/drivers/gpu/drm/radeon/atombios_encoders.c
@@ -1048,7 +1048,7 @@ atombios_dig_transmitter_setup(struct drm_encoder *encoder, int action, uint8_t
}
if (is_dp)
args.v5.ucLaneNum = dp_lane_count;
- else if (radeon_encoder->pixel_clock > 165000)
+ else if (radeon_dig_monitor_is_duallink(encoder, radeon_encoder->pixel_clock))
args.v5.ucLaneNum = 8;
else
args.v5.ucLaneNum = 4;