[PATCH] drm/amdgpu: remove gpu info firmware of green sardine

[Huang Rui]

On Tue, Jan 19, 2021 at 02:25:36PM +0800, Liang, Prike wrote:
> [AMD Official Use Only - Internal Distribution Only]
> 
> Thanks help clean up. Generally that seems fine but could we keep the green sardine chip name to retrieve the GPU info FW when the IP discovery fail back to legacy mode?

Do you want to only clean MODULE_FIRMWARE(gpu_info.bin)? That's fine for
me.

Thanks,
Ray

> 
> Anyway this patch is Reviewed-by: Prike Liang <Prike.Liang at amd.com>
> 
> Thanks,
> Prike
> > -----Original Message-----
> > From: Huang, Ray <Ray.Huang at amd.com>
> > Sent: Tuesday, January 19, 2021 1:52 PM
> > To: amd-gfx at lists.freedesktop.org
> > Cc: Deucher, Alexander <Alexander.Deucher at amd.com>; Liang, Prike
> > <Prike.Liang at amd.com>; Huang, Ray <Ray.Huang at amd.com>
> > Subject: [PATCH] drm/amdgpu: remove gpu info firmware of green sardine
> >
> > The ip discovery is supported on green sardine, it doesn't need gpu info
> > firmware anymore.
> >
> > Signed-off-by: Huang Rui <ray.huang at amd.com>
> > ---
> >  drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 3 +--
> >  1 file changed, 1 insertion(+), 2 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> > b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> > index 4d434803fb49..f1a426d8861d 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> > @@ -81,7 +81,6 @@ MODULE_FIRMWARE("amdgpu/navi10_gpu_info.bin");
> >  MODULE_FIRMWARE("amdgpu/navi14_gpu_info.bin");
> >  MODULE_FIRMWARE("amdgpu/navi12_gpu_info.bin");
> >  MODULE_FIRMWARE("amdgpu/vangogh_gpu_info.bin");
> > -MODULE_FIRMWARE("amdgpu/green_sardine_gpu_info.bin");
> >
> >  #define AMDGPU_RESUME_MS2000
> >
> > @@ -1825,7 +1824,7 @@ static int
> > amdgpu_device_parse_gpu_info_fw(struct amdgpu_device *adev)
> >  if (adev->apu_flags & AMD_APU_IS_RENOIR)
> >  chip_name = "renoir";
> >  else
> > -chip_name = "green_sardine";
> > +return 0;
> >  break;
> >  case CHIP_NAVI10:
> >  chip_name = "navi10";
> > --
> > 2.25.1
>