[1/1] drm/i915/glk: Add MODULE_FIRMWARE for Geminilake

Message ID 20181008053558.17552-2-kai.heng.feng@canonical.com
State New
Headers show
Series
  • Add missing firmware info for Intel GLK
Related show

Commit Message

Kai-Heng Feng Oct. 8, 2018, 5:35 a.m.
From: Ian W MORRISON <ianwmorrison@gmail.com>

BugLink: https://bugs.launchpad.net/bugs/1760545

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 f6d3e06f074721ad3a231df745d85b60428c1f03)
Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
---
 drivers/gpu/drm/i915/intel_csr.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Hui Wang Oct. 8, 2018, 6:42 a.m. | #1
Acked-by: Hui Wang <hui.wang@canonical.com>


On 2018年10月08日 13:35, Kai-Heng Feng wrote:
> From: Ian W MORRISON <ianwmorrison@gmail.com>
>
> BugLink: https://bugs.launchpad.net/bugs/1760545
>
> 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 f6d3e06f074721ad3a231df745d85b60428c1f03)
> Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.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 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"
Timo Aaltonen Oct. 18, 2018, 9:59 p.m. | #2
The subject doesn't say which kernel/release should get this

On 8.10.2018 8.35, Kai-Heng Feng wrote:
> From: Ian W MORRISON <ianwmorrison@gmail.com>
> 
> BugLink: https://bugs.launchpad.net/bugs/1760545
> 
> 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 f6d3e06f074721ad3a231df745d85b60428c1f03)
> Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.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 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"
>

Patch

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"