summaryrefslogtreecommitdiffstats
path: root/drm-i915-hush-check-crtc-state.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-03-03 09:00:03 -0500
committerJosh Boyer <jwboyer@fedoraproject.org>2015-03-03 09:00:03 -0500
commit3b35d75b8c3f7046e93c9bb9d0bfce145fbd9033 (patch)
tree327879b3e53e14b264bcc31af9308875f88be76b /drm-i915-hush-check-crtc-state.patch
parent2939fc47bcf1f4f0757c12dc94d0c2dfe0aba4ae (diff)
downloadkernel-3b35d75b8c3f7046e93c9bb9d0bfce145fbd9033.tar.gz
kernel-3b35d75b8c3f7046e93c9bb9d0bfce145fbd9033.tar.xz
kernel-3b35d75b8c3f7046e93c9bb9d0bfce145fbd9033.zip
Linux v4.0-rc1-178-g023a6007a08d
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 7a818a681..1bdf89484 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 3d220a67f865..8e18e0575d52 100644
+index 3117679299a6..ff781dc0535a 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
-@@ -10870,7 +10870,7 @@ check_crtc_state(struct drm_device *dev)
+@@ -10885,7 +10885,7 @@ check_crtc_state(struct drm_device *dev)
if (active &&
!intel_pipe_config_compare(dev, crtc->config, &pipe_config)) {