diff mbox series

drm/amdgpu: Add missing firmware entry for HAINAN

Message ID 20181119115512.18844-1-tiwai@suse.de (mailing list archive)
State Mainlined, archived
Commit 8d4d7c58994759bbd9f4fec32d88bf0e0b89302e
Headers show
Series drm/amdgpu: Add missing firmware entry for HAINAN | expand

Commit Message

Takashi Iwai Nov. 19, 2018, 11:55 a.m. UTC
Due to lack of MODULE_FIRMWARE() with hainan_mc.bin, the driver
doesn't work properly in initrd.  Let's add it.

Bugzilla: https://bugzilla.suse.com/show_bug.cgi?id=1116239
Fixes: 8eaf2b1faaf4 ("drm/amdgpu: switch firmware path for SI parts")
Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Christian König Nov. 19, 2018, 12:03 p.m. UTC | #1
Am 19.11.18 um 12:55 schrieb Takashi Iwai:
> Due to lack of MODULE_FIRMWARE() with hainan_mc.bin, the driver
> doesn't work properly in initrd.  Let's add it.
>
> Bugzilla: https://bugzilla.suse.com/show_bug.cgi?id=1116239
> Fixes: 8eaf2b1faaf4 ("drm/amdgpu: switch firmware path for SI parts")
> Cc: <stable@vger.kernel.org>
> Signed-off-by: Takashi Iwai <tiwai@suse.de>

Reviewed-by: Christian König <christian.koenig@amd.com>

> ---
>   drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 1 +
>   1 file changed, 1 insertion(+)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
> index e1c2b4e9c7b2..73ad02aea2b2 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
> @@ -46,6 +46,7 @@ MODULE_FIRMWARE("amdgpu/tahiti_mc.bin");
>   MODULE_FIRMWARE("amdgpu/pitcairn_mc.bin");
>   MODULE_FIRMWARE("amdgpu/verde_mc.bin");
>   MODULE_FIRMWARE("amdgpu/oland_mc.bin");
> +MODULE_FIRMWARE("amdgpu/hainan_mc.bin");
>   MODULE_FIRMWARE("amdgpu/si58_mc.bin");
>   
>   #define MC_SEQ_MISC0__MT__MASK   0xf0000000
Alex Deucher Nov. 19, 2018, 7:23 p.m. UTC | #2
On Mon, Nov 19, 2018 at 7:03 AM Christian König
<ckoenig.leichtzumerken@gmail.com> wrote:
>
> Am 19.11.18 um 12:55 schrieb Takashi Iwai:
> > Due to lack of MODULE_FIRMWARE() with hainan_mc.bin, the driver
> > doesn't work properly in initrd.  Let's add it.
> >
> > Bugzilla: https://bugzilla.suse.com/show_bug.cgi?id=1116239
> > Fixes: 8eaf2b1faaf4 ("drm/amdgpu: switch firmware path for SI parts")
> > Cc: <stable@vger.kernel.org>
> > Signed-off-by: Takashi Iwai <tiwai@suse.de>
>
> Reviewed-by: Christian König <christian.koenig@amd.com>
>

Applied.  thanks!

Alex

> > ---
> >   drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 1 +
> >   1 file changed, 1 insertion(+)
> >
> > diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
> > index e1c2b4e9c7b2..73ad02aea2b2 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
> > @@ -46,6 +46,7 @@ MODULE_FIRMWARE("amdgpu/tahiti_mc.bin");
> >   MODULE_FIRMWARE("amdgpu/pitcairn_mc.bin");
> >   MODULE_FIRMWARE("amdgpu/verde_mc.bin");
> >   MODULE_FIRMWARE("amdgpu/oland_mc.bin");
> > +MODULE_FIRMWARE("amdgpu/hainan_mc.bin");
> >   MODULE_FIRMWARE("amdgpu/si58_mc.bin");
> >
> >   #define MC_SEQ_MISC0__MT__MASK   0xf0000000
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
diff mbox series

Patch

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
index e1c2b4e9c7b2..73ad02aea2b2 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
@@ -46,6 +46,7 @@  MODULE_FIRMWARE("amdgpu/tahiti_mc.bin");
 MODULE_FIRMWARE("amdgpu/pitcairn_mc.bin");
 MODULE_FIRMWARE("amdgpu/verde_mc.bin");
 MODULE_FIRMWARE("amdgpu/oland_mc.bin");
+MODULE_FIRMWARE("amdgpu/hainan_mc.bin");
 MODULE_FIRMWARE("amdgpu/si58_mc.bin");
 
 #define MC_SEQ_MISC0__MT__MASK   0xf0000000