summaryrefslogtreecommitdiffstats
path: root/drm-i915-hush-check-crtc-state.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-12-09 09:25:39 -0500
committerJosh Boyer <jwboyer@fedoraproject.org>2014-12-09 09:25:39 -0500
commit1e63a382c146488671741eea55e332a0e0dc58dd (patch)
treeaa0c976a3fb3be82e332aca5db4708bfa6cb048c /drm-i915-hush-check-crtc-state.patch
parent553d726e108f46e6c04f819b28347af3fd6c2820 (diff)
downloadkernel-1e63a382c146488671741eea55e332a0e0dc58dd.tar.gz
kernel-1e63a382c146488671741eea55e332a0e0dc58dd.tar.xz
kernel-1e63a382c146488671741eea55e332a0e0dc58dd.zip
Linux v3.18
Diffstat (limited to 'drm-i915-hush-check-crtc-state.patch')
-rw-r--r--drm-i915-hush-check-crtc-state.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/drm-i915-hush-check-crtc-state.patch b/drm-i915-hush-check-crtc-state.patch
index 8ad31e7ef..0a76d10c1 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 8bcdb981d540..383390add737 100644
+index 9cb5c95d5898..edf0d4b78d68 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
-@@ -10967,7 +10967,7 @@ check_crtc_state(struct drm_device *dev)
+@@ -10965,7 +10965,7 @@ check_crtc_state(struct drm_device *dev)
if (active &&
!intel_pipe_config_compare(dev, &crtc->config, &pipe_config)) {
@@ -27,5 +27,5 @@ index 8bcdb981d540..383390add737 100644
"[hw state]");
intel_dump_pipe_config(crtc, &crtc->config,
--
-1.9.3
+2.1.0