Commit b607990c authored Apr 11, 2018 by Ian W MORRISON Committed by Joonas Lahtinen Apr 30, 2018

drm/i915/glk: Add MODULE_FIRMWARE for Geminilake

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)

Signed-off-by: Ian W MORRISON <ianwmorrison@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180411044213.383-1-ianwmorrison@gmail.com


(cherry picked from commit f6d3e06f)
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>

parent 6da6c0db

drivers/gpu/drm/i915/intel_csr.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -35,6 +35,7 @@
	*/		*/

	#define I915_CSR_GLK "i915/glk_dmc_ver1_04.bin"		#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 GLK_CSR_VERSION_REQUIRED CSR_VERSION(1, 4)

	#define I915_CSR_CNL "i915/cnl_dmc_ver1_07.bin"		#define I915_CSR_CNL "i915/cnl_dmc_ver1_07.bin"