From patchwork Wed Jan 13 17:38:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 8027551 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 096569F1CC for ; Wed, 13 Jan 2016 17:38:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2DA93201CD for ; Wed, 13 Jan 2016 17:38:33 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 1DB5220513 for ; Wed, 13 Jan 2016 17:38:32 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 572A77A083; Wed, 13 Jan 2016 09:38:31 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-f50.google.com (mail-wm0-f50.google.com [74.125.82.50]) by gabe.freedesktop.org (Postfix) with ESMTPS id BBDDE7A083 for ; Wed, 13 Jan 2016 09:38:29 -0800 (PST) Received: by mail-wm0-f50.google.com with SMTP id f206so304156097wmf.0 for ; Wed, 13 Jan 2016 09:38:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=guPbqTTrSXhnNrvY07fNAngmXrnOcDd062gXSELuhyY=; b=FlRGot0h3/1OqjNBq87R0Lg1a02SpaJuwcuLeKST2yGNex97JWZP/tMQZ0nz0jC1DL CWuMZm3n67+V8FQcTCKayRPA18xxCYwffETlp0j7oBud95eFBeRfBstQVCaQmwNfu9tj /FooY0GFUq4OxRhdUqb6GXKNzlZ3dt/DAD0WTe4a34P4DxRxfBvaPsLfwBEbXf06YY76 LlkFaM6oQM26baxTxm/NA0clcLujGFPl8q+Sm2aI19/2oJ7mUbUq+tWIKiSMCMMN/864 Hd7/fsxySWUeIkrJjwd+63pweE0Qu5IL4vqrGF0PcvkQMXlnp7BSNfHYKSSP0tkGNgTz UJRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=guPbqTTrSXhnNrvY07fNAngmXrnOcDd062gXSELuhyY=; b=V4IALQrWGRf4COlZGIz6/GFI+v/y1DjTiFJ6OUS0Fz3VeY6qzN84UAoPJ9q9C54E2s iL5u9dceH8cCCSrXe9rlf1Z9M2rt4iDE9+6MbXFUVq3CNhqj+uBK/B4RgQnC8+rPy6q7 +zIwCjOIuV5/NMZbu/utTZDNn55/YGaF0t88mralQ3CBt00Cf4qcq+lvul6fo1TWsSWM U8jtHqsDbYnry1HZH4TmYkFJqdgQvrk1dWdwVXlceuoT5CWeKw4aZwDoqlfgubIAfOGz W95DUMLTyJPBcSBOPtJnNEi8Bea/wJwwds/skRNmz9GPyHSTfn1LPVNSzPjuO809gtxg P3lw== X-Gm-Message-State: ALoCoQl5d5ZY+6mEytd/ST6+gdf8Tcmg39Ej866RqxOM1Twbt6DpCVGiNw4Ctr8wkc6lscWyt1yZmwdwDwtt8osL9kfjerW9Gw== X-Received: by 10.28.59.136 with SMTP id i130mr28601871wma.12.1452706708315; Wed, 13 Jan 2016 09:38:28 -0800 (PST) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id q75sm23281056wmd.6.2016.01.13.09.38.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 13 Jan 2016 09:38:27 -0800 (PST) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Wed, 13 Jan 2016 17:38:15 +0000 Message-Id: <1452706695-13518-1-git-send-email-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.7.0.rc3 Cc: Jani Nikula , Daniel Vetter Subject: [Intel-gfx] [PATCH] drm/i915: Demote user facing DMC firmware load failure message 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.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,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 This is an expected error given the lack of the firmware so emit it at KERN_NOTICE and not KERN_ERROR. Also include the firmware URL in the user facing message so that the user can investigate and fix the issue on their own, and also explain the consequence in plain language. The complete failure message, including the first line from the firmware loader, becomes i915 0000:00:02.0: Direct firmware load for i915/skl_dmc_ver1.bin failed with error -2 i915 0000:00:02.0: Failed to load DMC firmware [https://01.org/linuxgraphics/intel-linux-graphics-firmwares], disabling runtime power management. Signed-off-by: Chris Wilson Cc: Damien Lespiau Cc: Imre Deak Cc: Sunil Kamath Cc: Daniel Vetter Cc: Animesh Manna Cc: Jani Nikula Reviewed-by: Damien Lespiau --- drivers/gpu/drm/i915/intel_csr.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_csr.c b/drivers/gpu/drm/i915/intel_csr.c index 3f2850029c17..5c2f9a40c81b 100644 --- a/drivers/gpu/drm/i915/intel_csr.c +++ b/drivers/gpu/drm/i915/intel_csr.c @@ -44,6 +44,8 @@ #define I915_CSR_SKL "i915/skl_dmc_ver1.bin" #define I915_CSR_BXT "i915/bxt_dmc_ver1.bin" +#define FIRMWARE_URL "https://01.org/linuxgraphics/intel-linux-graphics-firmwares" + MODULE_FIRMWARE(I915_CSR_SKL); MODULE_FIRMWARE(I915_CSR_BXT); @@ -282,7 +284,7 @@ static uint32_t *parse_csr_fw(struct drm_i915_private *dev_priv, csr->version < SKL_CSR_VERSION_REQUIRED) { DRM_INFO("Refusing to load old Skylake DMC firmware v%u.%u," " please upgrade to v%u.%u or later" - " [https://01.org/linuxgraphics/intel-linux-graphics-firmwares].\n", + " [" FIRMWARE_URL "].\n", CSR_VERSION_MAJOR(csr->version), CSR_VERSION_MINOR(csr->version), CSR_VERSION_MAJOR(SKL_CSR_VERSION_REQUIRED), @@ -400,7 +402,10 @@ out: CSR_VERSION_MAJOR(csr->version), CSR_VERSION_MINOR(csr->version)); } else { - DRM_ERROR("Failed to load DMC firmware, disabling rpm\n"); + dev_notice(dev_priv->dev->dev, + "Failed to load DMC firmware" + " [" FIRMWARE_URL "]," + " disabling runtime power management.\n"); } release_firmware(fw);