From 76ceff3417336f4f423489381741029837819387 Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Thu, 29 Jan 2015 11:35:47 -0500 Subject: Backport patch from Rob Clark to toggle i915 state machine checks --- drm-i915-hush-check-crtc-state.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 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 7709e6b67..6e25762b8 100644 --- a/drm-i915-hush-check-crtc-state.patch +++ b/drm-i915-hush-check-crtc-state.patch @@ -14,14 +14,14 @@ 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 e7a16f119a29..e1489e6c0dc7 100644 +index 76cd2205bc9c..b1285eec32ba 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -10869,7 +10869,7 @@ check_crtc_state(struct drm_device *dev) if (active && !intel_pipe_config_compare(dev, &crtc->config, &pipe_config)) { -- WARN(1, "pipe state doesn't match!\n"); +- 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, "[hw state]"); -- cgit