From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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> 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 List-ID: 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