diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-09-08 08:34:33 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-09-08 08:34:33 -0400 |
| commit | 31448c54f6beec3379570633eef2436db361b26f (patch) | |
| tree | 70db236286c758ba8e346e3b770b8fe1d60adfe8 /drm-i915-hush-check-crtc-state.patch | |
| parent | f88858c592075f9b1ac9149d8c150025e944ebcc (diff) | |
| download | kernel-31448c54f6beec3379570633eef2436db361b26f.tar.gz kernel-31448c54f6beec3379570633eef2436db361b26f.tar.xz kernel-31448c54f6beec3379570633eef2436db361b26f.zip | |
Linux v4.2-9700-g7d9071a09502
Diffstat (limited to 'drm-i915-hush-check-crtc-state.patch')
| -rw-r--r-- | drm-i915-hush-check-crtc-state.patch | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/drm-i915-hush-check-crtc-state.patch b/drm-i915-hush-check-crtc-state.patch index 31df993a0..fa4baffbf 100644 --- a/drm-i915-hush-check-crtc-state.patch +++ b/drm-i915-hush-check-crtc-state.patch @@ -1,3 +1,4 @@ +From 02f47b49ab1cdbe62ceb71b658e2c469799ae368 Mon Sep 17 00:00:00 2001 From: Adam Jackson <ajax@redhat.com> Date: Wed, 13 Nov 2013 10:17:24 -0500 Subject: [PATCH] drm/i915: hush check crtc state @@ -14,15 +15,18 @@ 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 647b1404c441..e102a06f26e0 100644 +index ca9278be49f7..308ac0539a87 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c -@@ -12322,7 +12322,7 @@ check_crtc_state(struct drm_device *dev) - - if (active && - !intel_pipe_config_compare(dev, crtc->config, &pipe_config)) { +@@ -12688,7 +12688,7 @@ check_crtc_state(struct drm_device *dev, struct drm_atomic_state *old_state) + sw_config = to_intel_crtc_state(crtc->state); + if (!intel_pipe_config_compare(dev, sw_config, + pipe_config, false)) { - I915_STATE_WARN(1, "pipe state doesn't match!\n"); + DRM_DEBUG_KMS("pipe state doesn't match!\n"); - intel_dump_pipe_config(crtc, &pipe_config, + intel_dump_pipe_config(intel_crtc, pipe_config, "[hw state]"); - intel_dump_pipe_config(crtc, crtc->config, + intel_dump_pipe_config(intel_crtc, sw_config, +-- +2.4.3 + |