2018-04-10 06:41:01

by Ian W MORRISON

[permalink] [raw]
Subject: [PATCH 1/1] drm/i915/glk: Add MODULE_FIRMWARE for Geminilake

From: Ian W MORRISON <[email protected]>

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: [email protected]
Signed-off-by: Ian W MORRISON <[email protected]>
---
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