summaryrefslogtreecommitdiffstats
path: root/drm-i915-hush-check-crtc-state.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-03-23 15:05:09 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2015-03-23 15:05:09 -0400
commit332f9893c3cd9d58ee1de29d5358a60da5735cfa (patch)
tree17f429388bb37e13b7f714b7feea0143851044f4 /drm-i915-hush-check-crtc-state.patch
parentfd83f61c73b85d07beee7dad3039189bb1e06427 (diff)
downloadkernel-332f9893c3cd9d58ee1de29d5358a60da5735cfa.tar.gz
kernel-332f9893c3cd9d58ee1de29d5358a60da5735cfa.tar.xz
kernel-332f9893c3cd9d58ee1de29d5358a60da5735cfa.zip
Linux v4.0-rc5
Diffstat (limited to 'drm-i915-hush-check-crtc-state.patch')
-rw-r--r--drm-i915-hush-check-crtc-state.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/drm-i915-hush-check-crtc-state.patch b/drm-i915-hush-check-crtc-state.patch
index beea2dc2e..7391de005 100644
--- a/drm-i915-hush-check-crtc-state.patch
+++ b/drm-i915-hush-check-crtc-state.patch
@@ -14,10 +14,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 9943c20a741d..bfac247e6d2c 100644
+index 6d22128d97b1..e116dee10cf9 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
-@@ -10886,7 +10886,7 @@ check_crtc_state(struct drm_device *dev)
+@@ -10909,7 +10909,7 @@ check_crtc_state(struct drm_device *dev)
if (active &&
!intel_pipe_config_compare(dev, crtc->config, &pipe_config)) {