[PATCH] drm/i915: Change WARN_ON(!wm_changed) to I915_STATE_WARN_ON()

Lyude cpaul at redhat.com
Mon Feb 22 19:22:49 UTC 2016


These warnings still seem to be present with DP MST configurations. They
don't actually indicate any impending doom, so we may as well use
I915_STATE_WARN_ON() here to help quiet things down a little bit for
distro kernel users.

Signed-off-by: Lyude <cpaul at redhat.com>
---
 drivers/gpu/drm/i915/intel_pm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index a234687..1870185 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -3545,7 +3545,7 @@ static void skl_update_other_pipe_wm(struct drm_device *dev,
 		 * because it was really needed, so we expect the WM values to
 		 * be different.
 		 */
-		WARN_ON(!wm_changed);
+		I915_STATE_WARN_ON(!wm_changed);
 
 		skl_compute_wm_results(dev, &pipe_wm, r, intel_crtc);
 		r->dirty[intel_crtc->pipe] = true;
-- 
2.5.0



More information about the dri-devel mailing list