Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45db98e5 authored by Dave Airlie's avatar Dave Airlie
Browse files

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
parents f50d7146 d03874c8

drivers/gpu/drm/radeon/atombios_encoders.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1314,7 +1314,7 @@ atombios_dig_transmitter_setup(struct drm_encoder *encoder, int action, uint8_t 
			}

			}

			if (is_dp)

			if (is_dp)

				args.v5.ucLaneNum = dp_lane_count;

				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;

				args.v5.ucLaneNum = 8;

			else

			else

				args.v5.ucLaneNum = 4;

				args.v5.ucLaneNum = 4;