summaryrefslogtreecommitdiffstats
path: root/drm-i915-hush-check-crtc-state.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-06-29 11:24:25 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2015-06-29 11:24:25 -0400
commit76c11d9b55366c6da11ee821716d56b68110a2c6 (patch)
treeb7eae841919f78db12d303d20863564b05bf3f33 /drm-i915-hush-check-crtc-state.patch
parentc9229e16082bdc9b2f74a08bfdc77bcfed51df18 (diff)
downloadkernel-76c11d9b55366c6da11ee821716d56b68110a2c6.tar.gz
kernel-76c11d9b55366c6da11ee821716d56b68110a2c6.tar.xz
kernel-76c11d9b55366c6da11ee821716d56b68110a2c6.zip
Linux v4.1-11235-gc63f887bdae8
- Reenable debugging options.
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 24a13946d..68646bb7c 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 d0f3cbc87474..177016c009c5 100644
+index dcb1d25d6f05..60138a218a11 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
-@@ -11308,7 +11308,7 @@ check_crtc_state(struct drm_device *dev)
+@@ -12316,7 +12316,7 @@ check_crtc_state(struct drm_device *dev)
if (active &&
!intel_pipe_config_compare(dev, crtc->config, &pipe_config)) {