LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: ianwmorrison@gmail.com
To: rodrigo.vivi@intel.com, anusha.srivatsa@intel.com,
	michal.wajdeczko@intel.com, gregkh@linuxfoundation.org,
	airlied@linux.ie, jani.nikula@linux.intel.com,
	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: [RESEND PATCH 1/1] drm/i915/glk: Add MODULE_FIRMWARE for Geminilake
Date: Wed, 11 Apr 2018 14:42:13 +1000	[thread overview]
Message-ID: <20180411044213.383-1-ianwmorrison@gmail.com> (raw)

From: Ian W MORRISON <ianwmorrison@gmail.com>

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
Signed-off-by: Ian W MORRISON <ianwmorrison@gmail.com>
---
 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"
-- 
2.11.0

             reply	other threads:[~2018-04-11  4:42 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-11  4:42 ianwmorrison [this message]
2018-04-11  9:24 ` Jani Nikula
2018-04-11 10:41   ` Ian W MORRISON
2018-04-11 12:27     ` Jani Nikula
2018-04-11 13:04       ` Ian W MORRISON
2018-04-16 22:47       ` Srivatsa, Anusha
2018-04-17  9:02         ` Jani Nikula
2018-04-17 14:14           ` Joonas Lahtinen
2018-04-20  5:47             ` Ian W MORRISON
2018-04-20  7:50               ` Jani Nikula
2018-04-20  8:25                 ` Ian W MORRISON
2018-04-20 18:03           ` Rodrigo Vivi
2018-04-20 18:30             ` Srivatsa, Anusha
2018-04-21  1:22               ` Botello Ortega, Luis
2018-04-21 22:46                 ` Ian W MORRISON
2018-04-25 23:15                   ` Ian W MORRISON
2018-04-27  9:20                     ` Jani Nikula
2018-04-30  7:58                       ` Joonas Lahtinen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180411044213.383-1-ianwmorrison@gmail.com \
    --to=ianwmorrison@gmail.com \
    --cc=airlied@linux.ie \
    --cc=anusha.srivatsa@intel.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=jani.nikula@linux.intel.com \
    --cc=joonas.lahtinen@linux.intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=michal.wajdeczko@intel.com \
    --cc=rodrigo.vivi@intel.com \
    --cc=stable@vger.kernel.org \
    --subject='Re: [RESEND PATCH 1/1] drm/i915/glk: Add MODULE_FIRMWARE for Geminilake' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).