<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
</head>
<body text="#000000" bgcolor="#FFFFFF">
Acked-by: Hui Wang <a class="moz-txt-link-rfc2396E"
href="mailto:hui.wang@canonical.com"><hui.wang@canonical.com></a><br>
<br>
<br>
<div class="moz-cite-prefix">On 2018年10月08日 13:35, Kai-Heng Feng
wrote:<br>
</div>
<blockquote type="cite"
cite="mid:20181008053558.17552-2-kai.heng.feng@canonical.com">
<pre wrap="">From: Ian W MORRISON <a class="moz-txt-link-rfc2396E" href="mailto:ianwmorrison@gmail.com"><ianwmorrison@gmail.com></a>
BugLink: <a class="moz-txt-link-freetext" href="https://bugs.launchpad.net/bugs/1760545">https://bugs.launchpad.net/bugs/1760545</a>
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:
<a class="moz-txt-link-freetext" href="https://01.org/linuxgraphics/downloads/firmware">https://01.org/linuxgraphics/downloads/firmware</a>
and now shows that the firmware has correctly loaded:
[drm] Finished loading DMC firmware i915/glk_dmc_ver1_04.bin (v1.4)
Signed-off-by: Ian W MORRISON <a class="moz-txt-link-rfc2396E" href="mailto:ianwmorrison@gmail.com"><ianwmorrison@gmail.com></a>
Signed-off-by: Jani Nikula <a class="moz-txt-link-rfc2396E" href="mailto:jani.nikula@intel.com"><jani.nikula@intel.com></a>
Link: <a class="moz-txt-link-freetext" href="https://patchwork.freedesktop.org/patch/msgid/20180411044213.383-1-ianwmorrison@gmail.com">https://patchwork.freedesktop.org/patch/msgid/20180411044213.383-1-ianwmorrison@gmail.com</a>
(cherry picked from commit f6d3e06f074721ad3a231df745d85b60428c1f03)
Signed-off-by: Kai-Heng Feng <a class="moz-txt-link-rfc2396E" href="mailto:kai.heng.feng@canonical.com"><kai.heng.feng@canonical.com></a>
---
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 da9de47562b8..f9ee56fdf3ab 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_04.bin"
</pre>
</blockquote>
<br>
</body>
</html>