Received: by 10.192.165.156 with SMTP id m28csp487694imm; Wed, 11 Apr 2018 02:27:59 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/JKi3VI6+hbavnvhYRvHsS52EqqRWvjBr2NTx04RV3z7boxz31m11HDF+sl5PmVwg2jskm X-Received: by 2002:a17:902:57ce:: with SMTP id g14-v6mr4285233plj.222.1523438879017; Wed, 11 Apr 2018 02:27:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523438878; cv=none; d=google.com; s=arc-20160816; b=QKiYZwI1rxB4fCn1cawNIIUKGMcyoj9/TajGWJUQfv5zpC45lj5WfIBHewcA4J9CyF hzA68itlBABWZqFrJYbMwYOwQy3vHiE+FDIKV98u4LUqYfpHjeohIVkLPlBx4a86C839 uFLQAcvf8YLC3MIVo9I2qZVk/XO8gKbNiYkBGYqNQaL8yS8vOKx4DUxP15wPy/mzGMcC jlaAvFC1ITFLG0hZTcSvvtPnkqPVAGP6W50JpfgDkHL1BzlFzM4Idbv9u9a/kBeK/Kbo J5qMYvN8wPSEeEv6+DreGEdkcod2FZ2AD1o94Oh9D/gf6whinJmKHziO94vQ1kACNLUJ 9aXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:message-id:date:references :organization:in-reply-to:subject:cc:to:from :arc-authentication-results; bh=uEPDFvt0EKM5+3BLQ86zxnjX9FG6CEBxEfYeb3sOeOY=; b=VEPeiv8st6z7Gv7A0xGI0VkEjlbXgfgCSF7T8twyeyxzb+SfojWrunxTVS13B93gsZ 1qtHNrv2J9HuuLjCrENk/XMfdyekz11uA21JpVy3NRjeIzJJdusd5OIADUz/nr1y/6KS Dl6oV47AGl7ULXk60FgJ8MS5BYTqrx/pGCC7dGzWTsB2xMoyLbOx/dImr3PeMeZYktcm TVY8bTcvThawK44VST47UP5YRSc/jbZWM6Cm6hiqF1BXgHCEjJSJML2ZMj3g1etNlkmj ta2Yotzh4IqNm42yUmGu5cFe9NdaAHH1LQFY97RnyeRxXZFjAebBiS60Ty6ufAAJyQt7 rdfQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x6si534660pfx.216.2018.04.11.02.27.22; Wed, 11 Apr 2018 02:27:58 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752621AbeDKJYQ (ORCPT + 99 others); Wed, 11 Apr 2018 05:24:16 -0400 Received: from mga06.intel.com ([134.134.136.31]:62826 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752234AbeDKJYK (ORCPT ); Wed, 11 Apr 2018 05:24:10 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Apr 2018 02:24:09 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.48,435,1517904000"; d="scan'208";a="46010131" Received: from jnikula-mobl2.fi.intel.com (HELO localhost) ([10.237.72.62]) by fmsmga001.fm.intel.com with ESMTP; 11 Apr 2018 02:24:05 -0700 From: Jani Nikula To: ianwmorrison@gmail.com, rodrigo.vivi@intel.com, anusha.srivatsa@intel.com, michal.wajdeczko@intel.com, gregkh@linuxfoundation.org, airlied@linux.ie, joonas.lahtinen@linux.intel.com Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org, intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, ianwmorrison@gmail.com Subject: Re: [RESEND PATCH 1/1] drm/i915/glk: Add MODULE_FIRMWARE for Geminilake In-Reply-To: <20180411044213.383-1-ianwmorrison@gmail.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20180411044213.383-1-ianwmorrison@gmail.com> Date: Wed, 11 Apr 2018 12:24:55 +0300 Message-ID: <871sfmhz88.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 11 Apr 2018, ianwmorrison@gmail.com wrote: > From: Ian W MORRISON > > As the Geminilake firmware is now merged to linux-firmware.git > use MODUE_FIRMWARE to load the firmware. > > This removes the error message in the dmesg log: > > i915 0000:00:02.0: Direct firmware load for > i915/glk_dmc_ver1_04.bin failed with error -2 > i915 0000:00:02.0: Failed to load DMC firmware > i915/glk_dmc_ver1_04.bin. Disabling runtime power management. > i915 0000:00:02.0: DMC firmware homepage: > https://01.org/linuxgraphics/downloads/firmware > > and now shows that the firmware has correctly loaded: > > [drm] Finished loading DMC firmware i915/glk_dmc_ver1_04.bin (v1.4) > > Cc: stable@vger.kernel.org NAK on indiscriminate Cc: stable. There are zero guarantees that older kernels will work with whatever firmware you throw at them. Anusha, Rodrigo, are we even ready to do this in our -next? BR, Jani. PS. How is this a "RESEND"? I haven't seen this before. > Signed-off-by: Ian W MORRISON > --- > drivers/gpu/drm/i915/intel_csr.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/gpu/drm/i915/intel_csr.c b/drivers/gpu/drm/i915/intel_csr.c > index 41e6c75a7f3c..f9550ea46c26 100644 > --- a/drivers/gpu/drm/i915/intel_csr.c > +++ b/drivers/gpu/drm/i915/intel_csr.c > @@ -35,6 +35,7 @@ > */ > > #define I915_CSR_GLK "i915/glk_dmc_ver1_04.bin" > +MODULE_FIRMWARE(I915_CSR_GLK); > #define GLK_CSR_VERSION_REQUIRED CSR_VERSION(1, 4) > > #define I915_CSR_CNL "i915/cnl_dmc_ver1_07.bin" -- Jani Nikula, Intel Open Source Technology Center