diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-03-06 18:27:22 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-03-06 18:27:22 -0500 |
| commit | 45db98e54242f3ae94bdcfbfe754e743252eb168 (patch) | |
| tree | 9b7dab2e7f673a995881481b92e1424cb5ad8648 | |
| parent | f50d7146a298692daa730b40335e1466110727de (diff) | |
| parent | d03874c881a049a50e12f285077ab1f9fc2686e1 (diff) | |
Merge branch 'drm-fixes-3.14' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
one more radeon fix.
* 'drm-fixes-3.14' of git://people.freedesktop.org/~agd5f/linux:
drm/radeon/atom: select the proper number of lanes in transmitter setup
| -rw-r--r-- | drivers/gpu/drm/radeon/atombios_encoders.c | 2 |
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 2cec2ab02f80..607dc14d195e 100644 --- a/drivers/gpu/drm/radeon/atombios_encoders.c +++ b/drivers/gpu/drm/radeon/atombios_encoders.c | |||
| @@ -1314,7 +1314,7 @@ atombios_dig_transmitter_setup(struct drm_encoder *encoder, int action, uint8_t | |||
| 1314 | } | 1314 | } |
| 1315 | if (is_dp) | 1315 | if (is_dp) |
| 1316 | args.v5.ucLaneNum = dp_lane_count; | 1316 | args.v5.ucLaneNum = dp_lane_count; |
| 1317 | else if (radeon_encoder->pixel_clock > 165000) | 1317 | else if (radeon_dig_monitor_is_duallink(encoder, radeon_encoder->pixel_clock)) |
| 1318 | args.v5.ucLaneNum = 8; | 1318 | args.v5.ucLaneNum = 8; |
| 1319 | else | 1319 | else |
| 1320 | args.v5.ucLaneNum = 4; | 1320 | args.v5.ucLaneNum = 4; |