summaryrefslogtreecommitdiffstats
path: root/drm-i915-hush-check-crtc-state.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-09-08 08:19:57 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2014-09-08 08:19:57 -0400
commit8382f77e8117cb1c9cd38618f0030d85842856f7 (patch)
treef36f6fd3368f540144da565f59381e901463fd21 /drm-i915-hush-check-crtc-state.patch
parent39c21e4f5de35e508d6b46e94c616dfc3546cc11 (diff)
downloadkernel-8382f77e8117cb1c9cd38618f0030d85842856f7.tar.gz
kernel-8382f77e8117cb1c9cd38618f0030d85842856f7.tar.xz
kernel-8382f77e8117cb1c9cd38618f0030d85842856f7.zip
Linux v3.17-rc4
- Disable debugging options.
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 40a7eb600..e5276b3bf 100644
--- a/drm-i915-hush-check-crtc-state.patch
+++ b/drm-i915-hush-check-crtc-state.patch
@@ -1,4 +1,4 @@
-From cb2837e8dc37bcc1c7be60650c5ac1bc66c378b3 Mon Sep 17 00:00:00 2001
+From 6cc8410882cb492058c42bb2c5e9431a8f26921e 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 d074d704f458..e5ce498188c1 100644
+index d8324c69fa86..ee0ca36930f8 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
-@@ -10633,7 +10633,7 @@ check_crtc_state(struct drm_device *dev)
+@@ -10656,7 +10656,7 @@ check_crtc_state(struct drm_device *dev)
if (active &&
!intel_pipe_config_compare(dev, &crtc->config, &pipe_config)) {