summaryrefslogtreecommitdiffstats
path: root/drm-i915-hush-check-crtc-state.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-03-27 09:22:16 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2015-03-27 09:22:25 -0400
commit83d70862f351b14a7249fd710859cd6b6af9615a (patch)
treeb96b1564abf2ed7ac52ae436b71ff5031208261b /drm-i915-hush-check-crtc-state.patch
parent6b80640f60f77072509e79e48fd5085336320d79 (diff)
downloadkernel-83d70862f351b14a7249fd710859cd6b6af9615a.tar.gz
kernel-83d70862f351b14a7249fd710859cd6b6af9615a.tar.xz
kernel-83d70862f351b14a7249fd710859cd6b6af9615a.zip
Linux v4.0-rc5-96-g3c435c1e472b
- Fixes hangs due to i915 issues (rhbz 1204050 1206056)
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 7391de005..bd927d2f6 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 6d22128d97b1..e116dee10cf9 100644
+index f75173c20f47..1003782a38c4 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
-@@ -10909,7 +10909,7 @@ check_crtc_state(struct drm_device *dev)
+@@ -10917,7 +10917,7 @@ check_crtc_state(struct drm_device *dev)
if (active &&
!intel_pipe_config_compare(dev, crtc->config, &pipe_config)) {