diff options
author | Josh Boyer <jwboyer@fedoraproject.org> | 2014-07-14 09:39:24 -0400 |
---|---|---|
committer | Josh Boyer <jwboyer@fedoraproject.org> | 2014-07-14 09:39:53 -0400 |
commit | 7c50c7da7edb2b5aa3d8753d1a3cf2cc7af43e56 (patch) | |
tree | 93dfb6097f882bcee6ac333064f7236897b73b1f /Revert-drm-i915-reverse-dp-link-param-selection-pref.patch | |
parent | d23e5375ca546a628959202000ad12acf4e6331e (diff) | |
download | kernel-7c50c7da7edb2b5aa3d8753d1a3cf2cc7af43e56.tar.gz kernel-7c50c7da7edb2b5aa3d8753d1a3cf2cc7af43e56.tar.xz kernel-7c50c7da7edb2b5aa3d8753d1a3cf2cc7af43e56.zip |
Linux v3.16-rc5
- Fix i915 regression with external monitors (rhbz 1117008)
- Disable debugging options.
Diffstat (limited to 'Revert-drm-i915-reverse-dp-link-param-selection-pref.patch')
-rw-r--r-- | Revert-drm-i915-reverse-dp-link-param-selection-pref.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/Revert-drm-i915-reverse-dp-link-param-selection-pref.patch b/Revert-drm-i915-reverse-dp-link-param-selection-pref.patch new file mode 100644 index 000000000..25aff2f13 --- /dev/null +++ b/Revert-drm-i915-reverse-dp-link-param-selection-pref.patch @@ -0,0 +1,43 @@ +Bugzilla: 1117008 +Upstream-status: Sent to intel-gfx + +From b22370f0cf68e49ddcb3dd7033aba5ff6454dfcc Mon Sep 17 00:00:00 2001 +From: Dave Airlie <airlied@redhat.com> +Date: Mon, 14 Jul 2014 10:54:20 +1000 +Subject: [PATCH] Revert "drm/i915: reverse dp link param selection, prefer + fast over wide again" + +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 +Cc: stable@vger.kernel.org # v3.15 +Signed-off-by: Dave Airlie <airlied@redhat.com> +--- + drivers/gpu/drm/i915/intel_dp.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c +index 2a00cb8..61963d3 100644 +--- a/drivers/gpu/drm/i915/intel_dp.c ++++ b/drivers/gpu/drm/i915/intel_dp.c +@@ -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); +-- +1.9.3 + |