summaryrefslogtreecommitdiffstats
path: root/drm-i915-hush-check-crtc-state.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-10-14 10:54:21 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2014-10-14 10:54:21 -0400
commit7f1b8a88fb1168d40d9c812ca4d71ba3655c9115 (patch)
treef5a34fd374b9d43c0bf6bb08ad0a6ee27ab6fc9a /drm-i915-hush-check-crtc-state.patch
parentff180079f148953e56d8bac03c582df5e3343e45 (diff)
downloadkernel-7f1b8a88fb1168d40d9c812ca4d71ba3655c9115.tar.gz
kernel-7f1b8a88fb1168d40d9c812ca4d71ba3655c9115.tar.xz
kernel-7f1b8a88fb1168d40d9c812ca4d71ba3655c9115.zip
Linux v3.17-9283-g2d65a9f48fcd
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 b4bea5f76..ddcf314db 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 d8324c69fa86..ee0ca36930f8 100644
+index 507370513f3d..fa5bc89a4c93 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
-@@ -10656,7 +10656,7 @@ check_crtc_state(struct drm_device *dev)
+@@ -10966,7 +10966,7 @@ check_crtc_state(struct drm_device *dev)
if (active &&
!intel_pipe_config_compare(dev, &crtc->config, &pipe_config)) {