Revert "drm/i915: reverse dp link param selection, prefer fast over wide again"
Subsystems (2)
Dave Airlie
maintainerPATCH 1/1 Revert "drm/i915: reverse dp link param selection, prefer fast over wide again"
From: Dave Airlie <[email protected]>
This reverts commit 38aecea0ccbb909d635619cba22f1891e589b434.
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
--- drivers/gpu/drm/i915/intel_dp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +2 -2
@@ -833,8 +833,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 (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);
Signature · 1 line
1.9.3
Quoted 6 lines · Dave Airlie
From: Dave Airlie <[email protected]>
This reverts commit
38aecea0ccbb909d635619cba22f1891e589b434.This breaks Haswell Thinkpad + Lenovo dock in SST mode with a HDMI monitor attached.
Quoted 8 lines
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 [email protected] # v3.15Signed-off-by Dave Airlie <[email protected]>
Ugh, painful. Iirc your revert here wins on first-regression grounds, but I'd like to first try whether we can do better.
Paulo, can you please take a look? Iirc it's a hsw, but I guess Dave can throw logs at you.
-Daniel
Quoted 26 lines
--- drivers/gpu/drm/i915/intel_dp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/intel_dp.c +2
-2@@ -833,8 +833,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 (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);Signature · 6 lines
1.9.3 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Daniel Vetter
AppliedQuoted 6 lines · Dave Airlie
From: Dave Airlie <[email protected]>
This reverts commit
38aecea0ccbb909d635619cba22f1891e589b434.This breaks Haswell Thinkpad + Lenovo dock in SST mode with a HDMI monitor attached.
Quoted 8 lines
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 [email protected] # v3.15Signed-off-by Dave Airlie <[email protected]>
Picked up for -fixes, thanks for the patch. We've carried around the bdw-specific hack
commit f4cdbc21444a45d207a8dc175f44d2facfbd0845
Author: Jani Nikula <[email protected]> Date: Wed May 14 13:02:19 2014 +0300
drm/i915/dp: force eDP lane count to max available lanes on BDW
since a few months, the original patch is even older and yes, hsw is also affected here. And nothing happened. It's time to give up an revert. -Daniel
Quoted 26 lines
--- drivers/gpu/drm/i915/intel_dp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/intel_dp.c +2
-2@@ -833,8 +833,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 (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);Signature · 6 lines
1.9.3 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch