summaryrefslogtreecommitdiffstats
path: root/drm-i915-hush-check-crtc-state.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-08-25 10:33:49 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2014-08-25 10:33:49 -0400
commitefcd02beae521c75ac0164de68f497b5eb7be8ff (patch)
treef6f87d3b1a6f4da60871244bd3c2d63362ff1c02 /drm-i915-hush-check-crtc-state.patch
parent80bc74d4ce9e462bbd7fe79e75679969cfea70af (diff)
downloadkernel-efcd02beae521c75ac0164de68f497b5eb7be8ff.tar.gz
kernel-efcd02beae521c75ac0164de68f497b5eb7be8ff.tar.xz
kernel-efcd02beae521c75ac0164de68f497b5eb7be8ff.zip
Linux v3.17-rc1-231-g7be141d05549
- Add patch to fix NFS oops on /proc removal (rhbz 1132368)
Diffstat (limited to 'drm-i915-hush-check-crtc-state.patch')
-rw-r--r--drm-i915-hush-check-crtc-state.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/drm-i915-hush-check-crtc-state.patch b/drm-i915-hush-check-crtc-state.patch
index 1fb5ea015..e74605a68 100644
--- a/drm-i915-hush-check-crtc-state.patch
+++ b/drm-i915-hush-check-crtc-state.patch
@@ -1,4 +1,4 @@
-From e3f034a90a2dc3bf8afd7d10e43a76dcabea9188 Mon Sep 17 00:00:00 2001
+From 32d5013e685e54397ae7bd2d12e3107706e0020a Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Wed, 13 Nov 2013 10:17:24 -0500
Subject: [PATCH] drm/i915: hush check crtc state
@@ -15,10 +15,10 @@ Upstream-status: http://lists.freedesktop.org/archives/intel-gfx/2013-November/0
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
-index 018fb7222f60..922818d16e93 100644
+index d074d704f458..e5ce498188c1 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
-@@ -10640,7 +10640,7 @@ check_crtc_state(struct drm_device *dev)
+@@ -10633,7 +10633,7 @@ check_crtc_state(struct drm_device *dev)
if (active &&
!intel_pipe_config_compare(dev, &crtc->config, &pipe_config)) {