[SRU,Bionic] UBUNTU: SAUCE: drm/i915/glk: Add MODULE_FIRMWARE for Geminilake's DMC

Message ID 20180413210119.27661-1-seth.forshee@canonical.com
State New
Headers show
Series
  • [SRU,Bionic] UBUNTU: SAUCE: drm/i915/glk: Add MODULE_FIRMWARE for Geminilake's DMC
Related show

Commit Message

Seth Forshee April 13, 2018, 9:01 p.m.
BugLink: http://bugs.launchpad.net/bugs/1760545

The firmware is available in linux-firmware now, so add back the
MODULE_FIRMWARE statement.

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
---
Will also submit this patch upstream.

 drivers/gpu/drm/i915/intel_csr.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Kleber Souza June 4, 2018, 9:56 p.m. | #1
On 04/13/18 14:01, Seth Forshee wrote:
> BugLink: http://bugs.launchpad.net/bugs/1760545
> 
> The firmware is available in linux-firmware now, so add back the
> MODULE_FIRMWARE statement.
> 
> Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
> ---
> Will also submit this patch upstream.
> 
>  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"
> 

This change has made upstream as
b607990c76ceda0a7a7ceacabab174cdc8b9beee, we can have it cherry-picked
instead of a SAUCE patch.


Thanks,
Kleber

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"