From a98ed5ce60a3a27dd83f47a33d8993eaaef3685e Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 20 Feb 2017 13:20:23 -0600 Subject: Linux 4.10 rebase for stabilization --- drm-i915-hush-check-crtc-state.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (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 acf05056c..79deab178 100644 --- a/drm-i915-hush-check-crtc-state.patch +++ b/drm-i915-hush-check-crtc-state.patch @@ -20,7 +20,7 @@ index 46f9be3ad5a2..ad2e62e4cdba 100644 +++ 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); - if (!intel_pipe_config_compare(dev, sw_config, + if (!intel_pipe_config_compare(dev_priv, sw_config, pipe_config, false)) { - I915_STATE_WARN(1, "pipe state doesn't match!\n"); + DRM_DEBUG_KMS("pipe state doesn't match!\n"); -- cgit