From b4668f245f4965cc754efce0321172fcb4067895 Mon Sep 17 00:00:00 2001 From: Laura Abbott Date: Wed, 6 Sep 2017 11:11:28 -0700 Subject: Linux v4.13.1 --- drm-i915-hush-check-crtc-state.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'drm-i915-hush-check-crtc-state.patch') diff --git a/drm-i915-hush-check-crtc-state.patch b/drm-i915-hush-check-crtc-state.patch index 79deab178..cec67aaaa 100644 --- a/drm-i915-hush-check-crtc-state.patch +++ b/drm-i915-hush-check-crtc-state.patch @@ -1,6 +1,6 @@ -From 5550f20b5f9becb485fb3a67bf0193025d40bc6f Mon Sep 17 00:00:00 2001 +From 63a9dfe66b3b82b6eb10c6548aaf22dd7e543d2d Mon Sep 17 00:00:00 2001 From: Adam Jackson -Date: Wed, 13 Nov 2013 10:17:24 -0500 +Date: Mon, 10 Jul 2017 08:11:48 -0700 Subject: [PATCH] drm/i915: hush check crtc state This is _by far_ the most common backtrace for i915 on retrace.fp.o, and @@ -15,11 +15,11 @@ 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 46f9be3ad5a2..ad2e62e4cdba 100644 +index dec9e58..620f378a 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c -@@ -12970,7 +12970,7 @@ verify_crtc_state(struct drm_crtc *crtc, - sw_config = to_intel_crtc_state(crtc->state); +@@ -12277,7 +12277,7 @@ verify_crtc_state(struct drm_crtc *crtc, + sw_config = to_intel_crtc_state(new_crtc_state); if (!intel_pipe_config_compare(dev_priv, sw_config, pipe_config, false)) { - I915_STATE_WARN(1, "pipe state doesn't match!\n"); @@ -28,5 +28,5 @@ index 46f9be3ad5a2..ad2e62e4cdba 100644 "[hw state]"); intel_dump_pipe_config(intel_crtc, sw_config, -- -2.5.5 +2.7.5 -- cgit