rpms
/
kernel
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix i915 regression with external monitors (rhbz 1117008)

This commit is contained in:
Josh Boyer 2014-07-14 10:00:34 -04:00
parent 1d6e19b61a
commit cb4a8c74af
2 changed files with 52 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
Revert-drm-i915-reverse-dp-link-param-selection-pref.patch Normal file
View File

@ -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

9
kernel.spec
View File

@ -757,6 +757,9 @@ Patch25112: 0001-synaptics-Add-min-max-quirk-for-pnp-id-LEN2002-Edge-.patch
# https://bugs.freedesktop.org/show_bug.cgi?id=79813 submitted upstream
Patch25113: i915-fix-backlight-regression-misconfigured-VBT.patch
#rhbz 1117008
Patch25114: Revert-drm-i915-reverse-dp-link-param-selection-pref.patch
# END OF PATCH DEFINITIONS
%endif
@ -1473,6 +1476,9 @@ ApplyPatch 0001-synaptics-Add-min-max-quirk-for-pnp-id-LEN2002-Edge-.patch
# https://bugs.freedesktop.org/show_bug.cgi?id=79813 submitted upstream
ApplyPatch i915-fix-backlight-regression-misconfigured-VBT.patch
#rhbz 1117008
ApplyPatch Revert-drm-i915-reverse-dp-link-param-selection-pref.patch
# END OF PATCH APPLICATIONS
%endif
@ -2284,6 +2290,9 @@ fi
# ||----w |
# || ||
%changelog
* Mon Jul 14 2014 Josh Boyer <jwboyer@fedoraproject.org>
- Fix i915 regression with external monitors (rhbz 1117008)
* Fri Jul 11 2014 Peter Robinson <pbrobinson@fedoraproject.org>
- Enable ISL12057 RTC for ARM (NetGear ReadyNAS)