Linux v3.11.9
This commit is contained in:
Josh Boyer
parent
e1db685c44
commit
f48d5975b1
|
|
@ -1,86 +0,0 @@
|
|||
From 92c64493f41092185230c552c277b42bf6113140 Mon Sep 17 00:00:00 2001
|
||||
From: Jani Nikula <jani.nikula@intel.com>
|
||||
Date: Mon, 21 Oct 2013 10:52:07 +0300
|
||||
Subject: [PATCH 3/5] drm/i915/dp: workaround BIOS eDP bpp clamping issue
|
||||
|
||||
This isn't a real fix to the problem, but rather a stopgap measure while
|
||||
trying to find a proper solution.
|
||||
|
||||
There are several laptops out there that fail to light up the eDP panel
|
||||
in UEFI boot mode. They seem to be mostly IVB machines, including but
|
||||
apparently not limited to Dell XPS 13, Asus TX300, Asus UX31A, Asus
|
||||
UX32VD, Acer Aspire S7. They seem to work in CSM or legacy boot.
|
||||
|
||||
The difference between UEFI and CSM is that the BIOS provides a
|
||||
different VBT to the kernel. The UEFI VBT typically specifies 18 bpp and
|
||||
1.62 GHz link for eDP, while CSM VBT has 24 bpp and 2.7 GHz link. We end
|
||||
up clamping to 18 bpp in UEFI mode, which we can fit in the 1.62 Ghz
|
||||
link, and for reasons yet unknown fail to light up the panel.
|
||||
|
||||
Dithering from 24 to 18 bpp itself seems to work; if we use 18 bpp with
|
||||
2.7 GHz link, the eDP panel lights up. So essentially this is a link
|
||||
speed issue, and *not* a bpp clamping issue.
|
||||
|
||||
The bug raised its head since
|
||||
commit 657445fe8660100ad174600ebfa61536392b7624
|
||||
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
|
||||
Date: Sat May 4 10:09:18 2013 +0200
|
||||
|
||||
Revert "drm/i915: revert eDP bpp clamping code changes"
|
||||
|
||||
which started clamping bpp *before* computing the link requirements, and
|
||||
thus affecting the required bandwidth. Clamping after the computations
|
||||
kept the link at 2.7 GHz.
|
||||
|
||||
Even though the BIOS tells us to use 18 bpp through the VBT, it happily
|
||||
boots up at 24 bpp and 2.7 GHz itself! Use this information to
|
||||
selectively ignore the VBT provided value.
|
||||
|
||||
We can't ignore the VBT eDP bpp altogether, as there are other laptops
|
||||
that do require the clamping to be used due to EDID reporting higher bpp
|
||||
than the panel can support.
|
||||
|
||||
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=59841
|
||||
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=67950
|
||||
Tested-by: Ulf Winkelvos <ulf@winkelvos.de>
|
||||
Tested-by: jkp <jkp@iki.fi>
|
||||
CC: stable@vger.kernel.org
|
||||
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
|
||||
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
|
||||
---
|
||||
drivers/gpu/drm/i915/intel_dp.c | 20 ++++++++++++++++++++
|
||||
1 file changed, 20 insertions(+)
|
||||
|
||||
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
|
||||
index 3aed1fe..07eb447 100644
|
||||
--- a/drivers/gpu/drm/i915/intel_dp.c
|
||||
+++ b/drivers/gpu/drm/i915/intel_dp.c
|
||||
@@ -1371,6 +1371,26 @@ static void intel_dp_get_config(struct intel_encoder *encoder,
|
||||
}
|
||||
|
||||
pipe_config->adjusted_mode.flags |= flags;
|
||||
+
|
||||
+ if (is_edp(intel_dp) && dev_priv->vbt.edp_bpp &&
|
||||
+ pipe_config->pipe_bpp > dev_priv->vbt.edp_bpp) {
|
||||
+ /*
|
||||
+ * This is a big fat ugly hack.
|
||||
+ *
|
||||
+ * Some machines in UEFI boot mode provide us a VBT that has 18
|
||||
+ * bpp and 1.62 GHz link bandwidth for eDP, which for reasons
|
||||
+ * unknown we fail to light up. Yet the same BIOS boots up with
|
||||
+ * 24 bpp and 2.7 GHz link. Use the same bpp as the BIOS uses as
|
||||
+ * max, not what it tells us to use.
|
||||
+ *
|
||||
+ * Note: This will still be broken if the eDP panel is not lit
|
||||
+ * up by the BIOS, and thus we can't get the mode at module
|
||||
+ * load.
|
||||
+ */
|
||||
+ DRM_DEBUG_KMS("pipe has %d bpp for eDP panel, overriding BIOS-provided max %d bpp\n",
|
||||
+ pipe_config->pipe_bpp, dev_priv->vbt.edp_bpp);
|
||||
+ dev_priv->vbt.edp_bpp = pipe_config->pipe_bpp;
|
||||
+ }
|
||||
}
|
||||
|
||||
static void intel_disable_dp(struct intel_encoder *encoder)
|
||||
--
|
||||
1.8.3.1
|
||||
17
kernel.spec
17
kernel.spec
|
|
@ -74,7 +74,7 @@ Summary: The Linux kernel
|
|||
%if 0%{?released_kernel}
|
||||
|
||||
# Do we have a -stable update to apply?
|
||||
%define stable_update 8
|
||||
%define stable_update 9
|
||||
# Is it a -stable RC?
|
||||
%define stable_rc 0
|
||||
# Set rpm version accordingly
|
||||
|
|
@ -777,12 +777,6 @@ Patch25135: alps-Support-for-Dell-XT2-model.patch
|
|||
#rhbz 1011621
|
||||
Patch25137: cifs-Allow-LANMAN-auth-for-unencapsulated-auth-methods.patch
|
||||
|
||||
#rhbz 995782
|
||||
Patch25138: intel-3.12-stable-fixes.patch
|
||||
|
||||
#CVE-2013-4348 rhbz 1007939 1025647
|
||||
Patch25139: net-flow_dissector-fail-on-evil-iph-ihl.patch
|
||||
|
||||
#rhbz 1025769
|
||||
Patch25142: iwlwifi-dvm-dont-override-mac80211-queue-setting.patch
|
||||
|
||||
|
|
@ -1531,12 +1525,6 @@ ApplyPatch alps-Support-for-Dell-XT2-model.patch
|
|||
#rhbz 1011621
|
||||
ApplyPatch cifs-Allow-LANMAN-auth-for-unencapsulated-auth-methods.patch
|
||||
|
||||
#rhbz 995782
|
||||
ApplyPatch intel-3.12-stable-fixes.patch
|
||||
|
||||
#CVE-2013-4348 rhbz 1007939 1025647
|
||||
ApplyPatch net-flow_dissector-fail-on-evil-iph-ihl.patch
|
||||
|
||||
#rhbz 1025769
|
||||
ApplyPatch iwlwifi-dvm-dont-override-mac80211-queue-setting.patch
|
||||
|
||||
|
|
@ -2372,6 +2360,9 @@ fi
|
|||
# and build.
|
||||
|
||||
%changelog
|
||||
* Wed Nov 20 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.11.9-200
|
||||
- Linux v3.11.9
|
||||
|
||||
* Mon Nov 18 2013 Josh Boyer <jwboyer@fedoraproject.org>
|
||||
- Add patch to fix rhel5.9 KVM guests (rhbz 967652)
|
||||
- Add patch to fix crash from slab when using md-raid mirrors (rhbz 1031086)
|
||||
|
|
|
|||
|
|
@ -1,82 +0,0 @@
|
|||
Path: news.gmane.org!not-for-mail
|
||||
From: Jason Wang <jasowang@redhat.com>
|
||||
Newsgroups: gmane.linux.kernel,gmane.linux.network
|
||||
Subject: [PATCH net] net: flow_dissector: fail on evil iph->ihl
|
||||
Date: Fri, 1 Nov 2013 15:01:10 +0800
|
||||
Lines: 34
|
||||
Approved: news@gmane.org
|
||||
Message-ID: <1383289270-18952-1-git-send-email-jasowang@redhat.com>
|
||||
NNTP-Posting-Host: plane.gmane.org
|
||||
X-Trace: ger.gmane.org 1383289296 18578 80.91.229.3 (1 Nov 2013 07:01:36 GMT)
|
||||
X-Complaints-To: usenet@ger.gmane.org
|
||||
NNTP-Posting-Date: Fri, 1 Nov 2013 07:01:36 +0000 (UTC)
|
||||
Cc: Jason Wang <jasowang@redhat.com>,
|
||||
Petr Matousek <pmatouse@redhat.com>,
|
||||
"Michael S. Tsirkin" <mst@redhat.com>,
|
||||
Daniel Borkmann <dborkman@redhat.com>
|
||||
To: davem@davemloft.net, edumazet@google.com, netdev@vger.kernel.org,
|
||||
linux-kernel@vger.kernel.org
|
||||
Original-X-From: linux-kernel-owner@vger.kernel.org Fri Nov 01 08:01:39 2013
|
||||
Return-path: <linux-kernel-owner@vger.kernel.org>
|
||||
Envelope-to: glk-linux-kernel-3@plane.gmane.org
|
||||
Original-Received: from vger.kernel.org ([209.132.180.67])
|
||||
by plane.gmane.org with esmtp (Exim 4.69)
|
||||
(envelope-from <linux-kernel-owner@vger.kernel.org>)
|
||||
id 1Vc8jh-00034h-9Y
|
||||
for glk-linux-kernel-3@plane.gmane.org; Fri, 01 Nov 2013 08:01:37 +0100
|
||||
Original-Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
|
||||
id S1753899Ab3KAHB3 (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>);
|
||||
Fri, 1 Nov 2013 03:01:29 -0400
|
||||
Original-Received: from mx1.redhat.com ([209.132.183.28]:8081 "EHLO mx1.redhat.com"
|
||||
rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
|
||||
id S1752399Ab3KAHB1 (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
|
||||
Fri, 1 Nov 2013 03:01:27 -0400
|
||||
Original-Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])
|
||||
by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id rA171QgE005079
|
||||
(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK);
|
||||
Fri, 1 Nov 2013 03:01:26 -0400
|
||||
Original-Received: from jason-ThinkPad-T430s.nay.redhat.com (dhcp-66-71-71.eng.nay.redhat.com [10.66.71.71] (may be forged))
|
||||
by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id rA171Jpr015790;
|
||||
Fri, 1 Nov 2013 03:01:20 -0400
|
||||
X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12
|
||||
Original-Sender: linux-kernel-owner@vger.kernel.org
|
||||
Precedence: bulk
|
||||
List-ID: <linux-kernel.vger.kernel.org>
|
||||
X-Mailing-List: linux-kernel@vger.kernel.org
|
||||
Xref: news.gmane.org gmane.linux.kernel:1588387 gmane.linux.network:289242
|
||||
Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1588387>
|
||||
|
||||
We don't validate iph->ihl which may lead a dead loop if we meet a IPIP
|
||||
skb whose iph->ihl is zero. Fix this by failing immediately when iph->ihl
|
||||
is evil (less than 5).
|
||||
|
||||
This issue were introduced by commit ec5efe7946280d1e84603389a1030ccec0a767ae
|
||||
(rps: support IPIP encapsulation).
|
||||
|
||||
Cc: Eric Dumazet <edumazet@google.com>
|
||||
Cc: Petr Matousek <pmatouse@redhat.com>
|
||||
Cc: Michael S. Tsirkin <mst@redhat.com>
|
||||
Cc: Daniel Borkmann <dborkman@redhat.com>
|
||||
Signed-off-by: Jason Wang <jasowang@redhat.com>
|
||||
---
|
||||
This patch is needed for stable.
|
||||
---
|
||||
net/core/flow_dissector.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c
|
||||
index 8d7d0dd..143b6fd 100644
|
||||
--- a/net/core/flow_dissector.c
|
||||
+++ b/net/core/flow_dissector.c
|
||||
@@ -40,7 +40,7 @@ again:
|
||||
struct iphdr _iph;
|
||||
ip:
|
||||
iph = skb_header_pointer(skb, nhoff, sizeof(_iph), &_iph);
|
||||
- if (!iph)
|
||||
+ if (!iph || iph->ihl < 5)
|
||||
return false;
|
||||
|
||||
if (ip_is_fragment(iph))
|
||||
--
|
||||
1.8.1.2
|
||||
|
||||
Loading…
Reference in New Issue