summaryrefslogtreecommitdiffstats
path: root/drm-i915-hush-check-crtc-state.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-12-01 09:22:55 -0500
committerJosh Boyer <jwboyer@fedoraproject.org>2014-12-01 09:22:55 -0500
commite955e6d055f63650d023ce8df44aee028ea5a443 (patch)
tree82c89b97da8d8f60376cc478f9d67bb753e8ed53 /drm-i915-hush-check-crtc-state.patch
parent3695b77de1b473d24afe9cf8b94f2ccc1baf4a29 (diff)
downloadkernel-e955e6d055f63650d023ce8df44aee028ea5a443.tar.gz
kernel-e955e6d055f63650d023ce8df44aee028ea5a443.tar.xz
kernel-e955e6d055f63650d023ce8df44aee028ea5a443.zip
Linux v3.18-rc7
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 be7d43c6c..8ad31e7ef 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 f0a1a56406eb..e5fd8b9148a9 100644
+index 8bcdb981d540..383390add737 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
-@@ -10963,7 +10963,7 @@ check_crtc_state(struct drm_device *dev)
+@@ -10967,7 +10967,7 @@ check_crtc_state(struct drm_device *dev)
if (active &&
!intel_pipe_config_compare(dev, &crtc->config, &pipe_config)) {