summaryrefslogtreecommitdiffstats
path: root/drm-i915-hush-check-crtc-state.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-03-16 10:07:00 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2015-03-16 10:07:00 -0400
commit9608f11d20f9c69ff4c624dcf421721221599255 (patch)
treee4ee1f9536259e294f860ed0a371b82e823e6c0f /drm-i915-hush-check-crtc-state.patch
parentcd37906b18022c72b4599cb0af3cfbd1c001499c (diff)
downloadkernel-9608f11d20f9c69ff4c624dcf421721221599255.tar.gz
kernel-9608f11d20f9c69ff4c624dcf421721221599255.tar.xz
kernel-9608f11d20f9c69ff4c624dcf421721221599255.zip
Linux v4.0-rc4
- Drop arm64 RCU revert patch. Should be fixed properly upstream now. - Disable debugging options.
Diffstat (limited to 'drm-i915-hush-check-crtc-state.patch')
-rw-r--r--drm-i915-hush-check-crtc-state.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/drm-i915-hush-check-crtc-state.patch b/drm-i915-hush-check-crtc-state.patch
index 0c19b53bc..beea2dc2e 100644
--- a/drm-i915-hush-check-crtc-state.patch
+++ b/drm-i915-hush-check-crtc-state.patch
@@ -14,7 +14,7 @@ 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 e730789b53b7..74b3f14327cc 100644
+index 9943c20a741d..bfac247e6d2c 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)