diff mbox series

[SRU,Xenial] UBUNTU: ubuntu: i915_bpo - Add MODULE_FIRMWARE for Geminilake's DMC

Message ID 20180424161816.31742-1-seth.forshee@canonical.com
State New
Headers show
Series [SRU,Xenial] UBUNTU: ubuntu: i915_bpo - Add MODULE_FIRMWARE for Geminilake's DMC | expand

Commit Message

Seth Forshee April 24, 2018, 4:18 p.m. UTC
BugLink: http://bugs.launchpad.net/bugs/1752536

We ship this firmware but it fails to load because it is not
present in the initrd. Add a MODULE_FIRMWARE statement to fix
this.

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
---
 ubuntu/i915/intel_csr.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Juerg Haefliger April 25, 2018, 6:44 a.m. UTC | #1
On 04/24/2018 06:18 PM, Seth Forshee wrote:
> BugLink: http://bugs.launchpad.net/bugs/1752536
> 
> We ship this firmware but it fails to load because it is not
> present in the initrd. Add a MODULE_FIRMWARE statement to fix
> this.
> 
> Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
> ---
>  ubuntu/i915/intel_csr.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/ubuntu/i915/intel_csr.c b/ubuntu/i915/intel_csr.c
> index 91eb151242a1..2b3b428d9cd2 100644
> --- a/ubuntu/i915/intel_csr.c
> +++ b/ubuntu/i915/intel_csr.c
> @@ -42,6 +42,7 @@
>   */
>  
>  #define I915_CSR_KBL "i915/kbl_dmc_ver1.bin"
> +MODULE_FIRMWARE(I915_CSR_KBL);
>  #define KBL_CSR_VERSION_REQUIRED	CSR_VERSION(1, 1)

Acked-by: Juerg Haefliger <juergh@canonical.com>

but hat firmware blob seems to missing in linux-firmware in Xenial. Or
am I looking in the wrong place?

...Juerg



>  #define I915_CSR_SKL "i915/skl_dmc_ver1.bin"
>
Seth Forshee April 25, 2018, 12:53 p.m. UTC | #2
On Wed, Apr 25, 2018 at 08:44:24AM +0200, Juerg Haefliger wrote:
> On 04/24/2018 06:18 PM, Seth Forshee wrote:
> > BugLink: http://bugs.launchpad.net/bugs/1752536
> > 
> > We ship this firmware but it fails to load because it is not
> > present in the initrd. Add a MODULE_FIRMWARE statement to fix
> > this.
> > 
> > Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
> > ---
> >  ubuntu/i915/intel_csr.c | 1 +
> >  1 file changed, 1 insertion(+)
> > 
> > diff --git a/ubuntu/i915/intel_csr.c b/ubuntu/i915/intel_csr.c
> > index 91eb151242a1..2b3b428d9cd2 100644
> > --- a/ubuntu/i915/intel_csr.c
> > +++ b/ubuntu/i915/intel_csr.c
> > @@ -42,6 +42,7 @@
> >   */
> >  
> >  #define I915_CSR_KBL "i915/kbl_dmc_ver1.bin"
> > +MODULE_FIRMWARE(I915_CSR_KBL);
> >  #define KBL_CSR_VERSION_REQUIRED	CSR_VERSION(1, 1)
> 
> Acked-by: Juerg Haefliger <juergh@canonical.com>
> 
> but hat firmware blob seems to missing in linux-firmware in Xenial. Or
> am I looking in the wrong place?

It looks like it's there to me (albeit as a symlink), should be in
/lib/firmware/i915.

Seth
Juerg Haefliger April 25, 2018, 2:08 p.m. UTC | #3
On 04/25/2018 02:53 PM, Seth Forshee wrote:
> On Wed, Apr 25, 2018 at 08:44:24AM +0200, Juerg Haefliger wrote:
>> On 04/24/2018 06:18 PM, Seth Forshee wrote:
>>> BugLink: http://bugs.launchpad.net/bugs/1752536
>>>
>>> We ship this firmware but it fails to load because it is not
>>> present in the initrd. Add a MODULE_FIRMWARE statement to fix
>>> this.
>>>
>>> Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
>>> ---
>>>  ubuntu/i915/intel_csr.c | 1 +
>>>  1 file changed, 1 insertion(+)
>>>
>>> diff --git a/ubuntu/i915/intel_csr.c b/ubuntu/i915/intel_csr.c
>>> index 91eb151242a1..2b3b428d9cd2 100644
>>> --- a/ubuntu/i915/intel_csr.c
>>> +++ b/ubuntu/i915/intel_csr.c
>>> @@ -42,6 +42,7 @@
>>>   */
>>>  
>>>  #define I915_CSR_KBL "i915/kbl_dmc_ver1.bin"
>>> +MODULE_FIRMWARE(I915_CSR_KBL);
>>>  #define KBL_CSR_VERSION_REQUIRED	CSR_VERSION(1, 1)
>>
>> Acked-by: Juerg Haefliger <juergh@canonical.com>
>>
>> but hat firmware blob seems to missing in linux-firmware in Xenial. Or
>> am I looking in the wrong place?
> 
> It looks like it's there to me (albeit as a symlink), should be in
> /lib/firmware/i915.

It sure is there. Should have looked at the file list in the -updates
package :-(

Sorry for the noise.

...Juerg

> Seth
>
Kleber Sacilotto de Souza May 15, 2018, 2:42 p.m. UTC | #4
On 04/24/18 18:18, Seth Forshee wrote:
> BugLink: http://bugs.launchpad.net/bugs/1752536
> 
> We ship this firmware but it fails to load because it is not
> present in the initrd. Add a MODULE_FIRMWARE statement to fix
> this.
> 
> Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>

> ---
>  ubuntu/i915/intel_csr.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/ubuntu/i915/intel_csr.c b/ubuntu/i915/intel_csr.c
> index 91eb151242a1..2b3b428d9cd2 100644
> --- a/ubuntu/i915/intel_csr.c
> +++ b/ubuntu/i915/intel_csr.c
> @@ -42,6 +42,7 @@
>   */
>  
>  #define I915_CSR_KBL "i915/kbl_dmc_ver1.bin"
> +MODULE_FIRMWARE(I915_CSR_KBL);
>  #define KBL_CSR_VERSION_REQUIRED	CSR_VERSION(1, 1)
>  
>  #define I915_CSR_SKL "i915/skl_dmc_ver1.bin"
>
Kleber Sacilotto de Souza May 15, 2018, 2:44 p.m. UTC | #5
On 04/24/18 18:18, Seth Forshee wrote:
> BugLink: http://bugs.launchpad.net/bugs/1752536
> 
> We ship this firmware but it fails to load because it is not
> present in the initrd. Add a MODULE_FIRMWARE statement to fix
> this.
> 
> Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
> ---
>  ubuntu/i915/intel_csr.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/ubuntu/i915/intel_csr.c b/ubuntu/i915/intel_csr.c
> index 91eb151242a1..2b3b428d9cd2 100644
> --- a/ubuntu/i915/intel_csr.c
> +++ b/ubuntu/i915/intel_csr.c
> @@ -42,6 +42,7 @@
>   */
>  
>  #define I915_CSR_KBL "i915/kbl_dmc_ver1.bin"
> +MODULE_FIRMWARE(I915_CSR_KBL);
>  #define KBL_CSR_VERSION_REQUIRED	CSR_VERSION(1, 1)
>  
>  #define I915_CSR_SKL "i915/skl_dmc_ver1.bin"
> 

Applied to xenial/master-next branch.

Thanks,
Kleber
diff mbox series

Patch

diff --git a/ubuntu/i915/intel_csr.c b/ubuntu/i915/intel_csr.c
index 91eb151242a1..2b3b428d9cd2 100644
--- a/ubuntu/i915/intel_csr.c
+++ b/ubuntu/i915/intel_csr.c
@@ -42,6 +42,7 @@ 
  */
 
 #define I915_CSR_KBL "i915/kbl_dmc_ver1.bin"
+MODULE_FIRMWARE(I915_CSR_KBL);
 #define KBL_CSR_VERSION_REQUIRED	CSR_VERSION(1, 1)
 
 #define I915_CSR_SKL "i915/skl_dmc_ver1.bin"