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

Commit c6930992 authored by Dave Airlie's avatar Dave Airlie Committed by Daniel Vetter
Browse files

Revert "drm/i915: reverse dp link param selection, prefer fast over wide again" 

This reverts commit 38aecea0.

This breaks Haswell Thinkpad + Lenovo dock in SST mode with a HDMI monitor attached.

Before this we can 1920x1200 mode, after this we only ever get 1024x768, and
a lot of deferring.

This didn't revert clean, but this should be fine.

bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1117008


Cc: stable@vger.kernel.org # v3.15
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 9c8958bc

drivers/gpu/drm/i915/intel_dp.c

+2 −2
Original line number Diff line number Diff line
@@ -906,8 +906,8 @@ intel_dp_compute_config(struct intel_encoder *encoder, 
		mode_rate = intel_dp_link_required(adjusted_mode->crtc_clock,

						   bpp);



		for (lane_count = min_lane_count; lane_count <= max_lane_count; lane_count <<= 1) {

		for (clock = min_clock; clock <= max_clock; clock++) {

			for (lane_count = min_lane_count; lane_count <= max_lane_count; lane_count <<= 1) {

				link_clock = drm_dp_bw_code_to_link_rate(bws[clock]);

				link_avail = intel_dp_max_data_rate(link_clock,

								    lane_count);