drm/amdgpu: Add missing MODULE_FIRMWARE macro

Message ID 20230616121116.1031336-1-juerg.haefliger@canonical.com
State New
Headers
Series drm/amdgpu: Add missing MODULE_FIRMWARE macro |

Commit Message

Juerg Haefliger June 16, 2023, 12:11 p.m. UTC
  Add the missing MODULE_FIRMWARE macro for "amdgpu/fiji_smc.bin".

Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 1 +
 1 file changed, 1 insertion(+)
  

Comments

Alex Deucher June 16, 2023, 12:53 p.m. UTC | #1
On Fri, Jun 16, 2023 at 8:11 AM Juerg Haefliger
<juerg.haefliger@canonical.com> wrote:
>
> Add the missing MODULE_FIRMWARE macro for "amdgpu/fiji_smc.bin".
>
> Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> index 5c7d40873ee2..1f83a939d641 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> @@ -92,6 +92,7 @@ MODULE_FIRMWARE("amdgpu/picasso_gpu_info.bin");
>  MODULE_FIRMWARE("amdgpu/raven2_gpu_info.bin");
>  MODULE_FIRMWARE("amdgpu/arcturus_gpu_info.bin");
>  MODULE_FIRMWARE("amdgpu/navi12_gpu_info.bin");
> +MODULE_FIRMWARE("amdgpu/fiji_smc.bin");

This is already specified in smumgr.c.

Alex

>
>  #define AMDGPU_RESUME_MS               2000
>  #define AMDGPU_MAX_RETRY_LIMIT         2
> --
> 2.37.2
>
  
Juerg Haefliger June 19, 2023, 2:42 p.m. UTC | #2
On Fri, 16 Jun 2023 08:53:20 -0400
Alex Deucher <alexdeucher@gmail.com> wrote:

> On Fri, Jun 16, 2023 at 8:11 AM Juerg Haefliger
> <juerg.haefliger@canonical.com> wrote:
> >
> > Add the missing MODULE_FIRMWARE macro for "amdgpu/fiji_smc.bin".
> >
> > Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com>
> > ---
> >  drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 1 +
> >  1 file changed, 1 insertion(+)
> >
> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> > index 5c7d40873ee2..1f83a939d641 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> > @@ -92,6 +92,7 @@ MODULE_FIRMWARE("amdgpu/picasso_gpu_info.bin");
> >  MODULE_FIRMWARE("amdgpu/raven2_gpu_info.bin");
> >  MODULE_FIRMWARE("amdgpu/arcturus_gpu_info.bin");
> >  MODULE_FIRMWARE("amdgpu/navi12_gpu_info.bin");
> > +MODULE_FIRMWARE("amdgpu/fiji_smc.bin");  
> 
> This is already specified in smumgr.c.

It sure is. Sorry for the noise :-(

Thanks for looking at it.
..Juerg

 
> Alex
> 
> >
> >  #define AMDGPU_RESUME_MS               2000
> >  #define AMDGPU_MAX_RETRY_LIMIT         2
> > --
> > 2.37.2
> >
  

Patch

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 5c7d40873ee2..1f83a939d641 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -92,6 +92,7 @@  MODULE_FIRMWARE("amdgpu/picasso_gpu_info.bin");
 MODULE_FIRMWARE("amdgpu/raven2_gpu_info.bin");
 MODULE_FIRMWARE("amdgpu/arcturus_gpu_info.bin");
 MODULE_FIRMWARE("amdgpu/navi12_gpu_info.bin");
+MODULE_FIRMWARE("amdgpu/fiji_smc.bin");
 
 #define AMDGPU_RESUME_MS		2000
 #define AMDGPU_MAX_RETRY_LIMIT		2