From patchwork Mon Jan 18 16:08:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrik Jakobsson X-Patchwork-Id: 8055861 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id EA1179F440 for ; Mon, 18 Jan 2016 16:08:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 25943203F1 for ; Mon, 18 Jan 2016 16:08:39 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 1D8A420390 for ; Mon, 18 Jan 2016 16:08:38 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 350E56E564; Mon, 18 Jan 2016 08:08:37 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 6AF4A6E564 for ; Mon, 18 Jan 2016 08:08:35 -0800 (PST) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 18 Jan 2016 08:08:36 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.22,312,1449561600"; d="scan'208";a="895797854" Received: from patrik-desktop.isw.intel.com ([10.237.180.166]) by fmsmga002.fm.intel.com with ESMTP; 18 Jan 2016 08:08:33 -0800 From: Patrik Jakobsson To: intel-gfx@lists.freedesktop.org Date: Mon, 18 Jan 2016 17:08:42 +0100 Message-Id: <1453133322-17187-1-git-send-email-patrik.jakobsson@linux.intel.com> X-Mailer: git-send-email 2.5.0 Cc: daniel.vetter@ffwll.ch Subject: [Intel-gfx] [PATCH] drm/i915/skl: Tune down DC6 already enabled warning X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP For unknown reasons the DMC firmware overwrites our DC5/6 bits in the DC_STATE_EN register. This happens from time to time during the igt@kms_flip@basic-flip-vs-dpms test. We manually fix up the register when this occurs and so far that seems to work. This patch demotes the warning to a debug message to not clutter our CI results. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=93697 Cc: Daniel Vetter Signed-off-by: Patrik Jakobsson Reviewed-by: Daniel Vetter since it tunes down CI --- drivers/gpu/drm/i915/intel_runtime_pm.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c index 89a7dd8..68e213c 100644 --- a/drivers/gpu/drm/i915/intel_runtime_pm.c +++ b/drivers/gpu/drm/i915/intel_runtime_pm.c @@ -574,8 +574,10 @@ static void assert_can_enable_dc6(struct drm_i915_private *dev_priv) WARN_ONCE(!HAS_RUNTIME_PM(dev), "Runtime PM not enabled.\n"); WARN_ONCE(I915_READ(UTIL_PIN_CTL) & UTIL_PIN_ENABLE, "Backlight is not disabled.\n"); - WARN_ONCE((I915_READ(DC_STATE_EN) & DC_STATE_EN_UPTO_DC6), - "DC6 already programmed to be enabled.\n"); + + /* Sometimes fw incorrectly modify our bits so just debug print this */ + if ((I915_READ(DC_STATE_EN) & DC_STATE_EN_UPTO_DC6)) + DRM_DEBUG_KMS("DC6 already programmed to be enabled.\n"); assert_csr_loaded(dev_priv); }