From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752590AbcBVTXh (ORCPT ); Mon, 22 Feb 2016 14:23:37 -0500 Received: from mx1.redhat.com ([209.132.183.28]:51091 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751804AbcBVTXg (ORCPT ); Mon, 22 Feb 2016 14:23:36 -0500 From: Lyude To: intel-gfx@lists.freedesktop.org Cc: Rob Clark , Lyude , Daniel Vetter , Jani Nikula , David Airlie , dri-devel@lists.freedesktop.org (open list:INTEL DRM DRIVERS (excluding Poulsbo, Moorestow...), linux-kernel@vger.kernel.org (open list)) Subject: [PATCH] drm/i915: Change WARN_ON(!wm_changed) to I915_STATE_WARN_ON() Date: Mon, 22 Feb 2016 14:22:49 -0500 Message-Id: <1456168969-18430-1-git-send-email-cpaul@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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