summaryrefslogtreecommitdiffstats
path: root/drm-i915-hush-check-crtc-state.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-01-05 16:09:49 -0500
committerJosh Boyer <jwboyer@fedoraproject.org>2015-01-05 16:09:49 -0500
commit208228cebd8a9b5af5da4e12e3d90e4a03679cf0 (patch)
tree0cf4e87e7877bff42d1f3b480c2d585347ee3eba /drm-i915-hush-check-crtc-state.patch
parentbfe354a1c3609cdd83fd0647153365ff4f81701f (diff)
downloadkernel-208228cebd8a9b5af5da4e12e3d90e4a03679cf0.tar.gz
kernel-208228cebd8a9b5af5da4e12e3d90e4a03679cf0.tar.xz
kernel-208228cebd8a9b5af5da4e12e3d90e4a03679cf0.zip
Linux v3.19-rc2
- Temporarily disable aarch64patches - Happy New Year
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 0a76d10c1..329b59843 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 9cb5c95d5898..edf0d4b78d68 100644
+index fb3e3d429191..49e5d5f9fbe5 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
-@@ -10965,7 +10965,7 @@ check_crtc_state(struct drm_device *dev)
+@@ -10869,7 +10869,7 @@ check_crtc_state(struct drm_device *dev)
if (active &&
!intel_pipe_config_compare(dev, &crtc->config, &pipe_config)) {