From patchwork Tue Jul 5 09:25:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mika Kuoppala X-Patchwork-Id: 9213899 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A440060572 for ; Tue, 5 Jul 2016 09:25:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9516528984 for ; Tue, 5 Jul 2016 09:25:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 87E3E28986; Tue, 5 Jul 2016 09:25:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7C97C28984 for ; Tue, 5 Jul 2016 09:25:21 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0170A6E26C; Tue, 5 Jul 2016 09:25:21 +0000 (UTC) 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 BD5BE6E26C for ; Tue, 5 Jul 2016 09:25:18 +0000 (UTC) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 05 Jul 2016 02:25:18 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.26,579,1459839600"; d="scan'208"; a="1015865675" Received: from rosetta.fi.intel.com ([10.237.72.167]) by fmsmga002.fm.intel.com with ESMTP; 05 Jul 2016 02:25:17 -0700 Received: by rosetta.fi.intel.com (Postfix, from userid 1000) id 35DB45E0006; Tue, 5 Jul 2016 12:25:17 +0300 (EEST) From: Mika Kuoppala To: intel-gfx@lists.freedesktop.org Date: Tue, 5 Jul 2016 12:25:12 +0300 Message-Id: <1467710712-32431-1-git-send-email-mika.kuoppala@intel.com> X-Mailer: git-send-email 2.7.4 Cc: Rodrigo Vivi Subject: [Intel-gfx] [PATCH] drm/i915/dmc: Accept symbolic link in firmware name 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-Virus-Scanned: ClamAV using ClamSMTP We need the ability to explicitly load only a specified firmware version. As the firmware blob contains the version, we use that to filter out the ones we don't want. The version encoded into the firmware name is superfluous and we should allow user to point into specific firmware through a symlink, and only do filtering based on the version stamp included in the blob. This allows user to conveniently point to a firmware blob and still gives us the control of what we decided to run on. This is partial revert of 4aa7fb9c3c4f ("drm/i915/dmc: Step away from symbolic links") Fixes: 4aa7fb9c3c4f ("drm/i915/dmc: Step away from symbolic links") References: https://bugs.freedesktop.org/show_bug.cgi?id=96800 Reported-by: Mike Lothian Cc: Rodrigo Vivi Cc: Imre Deak Cc: Mika Kuoppala Cc: Patrik Jakobsson Cc: Chris Wilson Signed-off-by: Mika Kuoppala --- drivers/gpu/drm/i915/intel_csr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_csr.c b/drivers/gpu/drm/i915/intel_csr.c index ea047cd46b71..77d01a0b64b4 100644 --- a/drivers/gpu/drm/i915/intel_csr.c +++ b/drivers/gpu/drm/i915/intel_csr.c @@ -41,15 +41,15 @@ * be moved to FW_FAILED. */ -#define I915_CSR_KBL "i915/kbl_dmc_ver1_01.bin" +#define I915_CSR_KBL "i915/kbl_dmc_ver1.bin" MODULE_FIRMWARE(I915_CSR_KBL); #define KBL_CSR_VERSION_REQUIRED CSR_VERSION(1, 1) -#define I915_CSR_SKL "i915/skl_dmc_ver1_26.bin" +#define I915_CSR_SKL "i915/skl_dmc_ver1.bin" MODULE_FIRMWARE(I915_CSR_SKL); #define SKL_CSR_VERSION_REQUIRED CSR_VERSION(1, 26) -#define I915_CSR_BXT "i915/bxt_dmc_ver1_07.bin" +#define I915_CSR_BXT "i915/bxt_dmc_ver1.bin" MODULE_FIRMWARE(I915_CSR_BXT); #define BXT_CSR_VERSION_REQUIRED CSR_VERSION(1, 7)