* [PATCH] drm/amdgpu: remove gpu info firmware of green sardine
@ 2021-01-19 5:51 Huang Rui
2021-01-19 6:25 ` Liang, Prike
0 siblings, 1 reply; 6+ messages in thread
From: Huang Rui @ 2021-01-19 5:51 UTC (permalink / raw)
To: amd-gfx; +Cc: Alex Deucher, Prike Liang, Huang Rui
The ip discovery is supported on green sardine, it doesn't need gpu info
firmware anymore.
Signed-off-by: Huang Rui <ray.huang@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_MS 2000
@@ -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
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread
* RE: [PATCH] drm/amdgpu: remove gpu info firmware of green sardine
2021-01-19 5:51 [PATCH] drm/amdgpu: remove gpu info firmware of green sardine Huang Rui
@ 2021-01-19 6:25 ` Liang, Prike
2021-01-19 6:57 ` Huang Rui
0 siblings, 1 reply; 6+ messages in thread
From: Liang, Prike @ 2021-01-19 6:25 UTC (permalink / raw)
To: Huang, Ray, amd-gfx; +Cc: Deucher, Alexander
[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?
Anyway this patch is Reviewed-by: Prike Liang <Prike.Liang@amd.com>
Thanks,
Prike
> -----Original Message-----
> From: Huang, Ray <Ray.Huang@amd.com>
> Sent: Tuesday, January 19, 2021 1:52 PM
> To: amd-gfx@lists.freedesktop.org
> Cc: Deucher, Alexander <Alexander.Deucher@amd.com>; Liang, Prike
> <Prike.Liang@amd.com>; Huang, Ray <Ray.Huang@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@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
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/amdgpu: remove gpu info firmware of green sardine
2021-01-19 6:25 ` Liang, Prike
@ 2021-01-19 6:57 ` Huang Rui
2021-01-19 7:20 ` Liang, Prike
0 siblings, 1 reply; 6+ messages in thread
From: Huang Rui @ 2021-01-19 6:57 UTC (permalink / raw)
To: Liang, Prike; +Cc: Deucher, Alexander, amd-gfx
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@amd.com>
>
> Thanks,
> Prike
> > -----Original Message-----
> > From: Huang, Ray <Ray.Huang@amd.com>
> > Sent: Tuesday, January 19, 2021 1:52 PM
> > To: amd-gfx@lists.freedesktop.org
> > Cc: Deucher, Alexander <Alexander.Deucher@amd.com>; Liang, Prike
> > <Prike.Liang@amd.com>; Huang, Ray <Ray.Huang@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@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
>
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* RE: [PATCH] drm/amdgpu: remove gpu info firmware of green sardine
2021-01-19 6:57 ` Huang Rui
@ 2021-01-19 7:20 ` Liang, Prike
2021-01-19 14:11 ` Alex Deucher
0 siblings, 1 reply; 6+ messages in thread
From: Liang, Prike @ 2021-01-19 7:20 UTC (permalink / raw)
To: Huang, Ray; +Cc: Deucher, Alexander, amd-gfx
[AMD Official Use Only - Internal Distribution Only]
> -----Original Message-----
> From: Huang, Ray <Ray.Huang@amd.com>
> Sent: Tuesday, January 19, 2021 2:57 PM
> To: Liang, Prike <Prike.Liang@amd.com>
> Cc: amd-gfx@lists.freedesktop.org; Deucher, Alexander
> <Alexander.Deucher@amd.com>
> Subject: Re: [PATCH] drm/amdgpu: remove gpu info firmware of green
> sardine
>
> 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.
[Prike] Yeah, that seems enough just remove the green sardine GPU info FW declared for amdgpu driver module.
>
> Thanks,
> Ray
>
> >
> > Anyway this patch is Reviewed-by: Prike Liang <Prike.Liang@amd.com>
> >
> > Thanks,
> > Prike
> > > -----Original Message-----
> > > From: Huang, Ray <Ray.Huang@amd.com>
> > > Sent: Tuesday, January 19, 2021 1:52 PM
> > > To: amd-gfx@lists.freedesktop.org
> > > Cc: Deucher, Alexander <Alexander.Deucher@amd.com>; Liang, Prike
> > > <Prike.Liang@amd.com>; Huang, Ray <Ray.Huang@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@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
> >
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/amdgpu: remove gpu info firmware of green sardine
2021-01-19 7:20 ` Liang, Prike
@ 2021-01-19 14:11 ` Alex Deucher
2021-01-20 12:14 ` Huang Rui
0 siblings, 1 reply; 6+ messages in thread
From: Alex Deucher @ 2021-01-19 14:11 UTC (permalink / raw)
To: Liang, Prike; +Cc: Deucher, Alexander, Huang, Ray, amd-gfx
On Tue, Jan 19, 2021 at 2:20 AM Liang, Prike <Prike.Liang@amd.com> wrote:
>
> [AMD Official Use Only - Internal Distribution Only]
>
> > -----Original Message-----
> > From: Huang, Ray <Ray.Huang@amd.com>
> > Sent: Tuesday, January 19, 2021 2:57 PM
> > To: Liang, Prike <Prike.Liang@amd.com>
> > Cc: amd-gfx@lists.freedesktop.org; Deucher, Alexander
> > <Alexander.Deucher@amd.com>
> > Subject: Re: [PATCH] drm/amdgpu: remove gpu info firmware of green
> > sardine
> >
> > 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.
> [Prike] Yeah, that seems enough just remove the green sardine GPU info FW declared for amdgpu driver module.
> >
We can probably remove the renoir gpu_info firmware as well. We use
the IP discovery table there as well at this point.
Alex
> > Thanks,
> > Ray
> >
> > >
> > > Anyway this patch is Reviewed-by: Prike Liang <Prike.Liang@amd.com>
> > >
> > > Thanks,
> > > Prike
> > > > -----Original Message-----
> > > > From: Huang, Ray <Ray.Huang@amd.com>
> > > > Sent: Tuesday, January 19, 2021 1:52 PM
> > > > To: amd-gfx@lists.freedesktop.org
> > > > Cc: Deucher, Alexander <Alexander.Deucher@amd.com>; Liang, Prike
> > > > <Prike.Liang@amd.com>; Huang, Ray <Ray.Huang@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@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
> > >
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/amdgpu: remove gpu info firmware of green sardine
2021-01-19 14:11 ` Alex Deucher
@ 2021-01-20 12:14 ` Huang Rui
0 siblings, 0 replies; 6+ messages in thread
From: Huang Rui @ 2021-01-20 12:14 UTC (permalink / raw)
To: Alex Deucher; +Cc: Deucher, Alexander, Liang, Prike, amd-gfx
On Tue, Jan 19, 2021 at 10:11:54PM +0800, Alex Deucher wrote:
> On Tue, Jan 19, 2021 at 2:20 AM Liang, Prike <Prike.Liang@amd.com> wrote:
> >
> > [AMD Official Use Only - Internal Distribution Only]
> >
> > > -----Original Message-----
> > > From: Huang, Ray <Ray.Huang@amd.com>
> > > Sent: Tuesday, January 19, 2021 2:57 PM
> > > To: Liang, Prike <Prike.Liang@amd.com>
> > > Cc: amd-gfx@lists.freedesktop.org; Deucher, Alexander
> > > <Alexander.Deucher@amd.com>
> > > Subject: Re: [PATCH] drm/amdgpu: remove gpu info firmware of green
> > > sardine
> > >
> > > 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.
> > [Prike] Yeah, that seems enough just remove the green sardine GPU info FW declared for amdgpu driver module.
> > >
>
> We can probably remove the renoir gpu_info firmware as well. We use
> the IP discovery table there as well at this point.
I will check the renoir platform later.
Thanks,
Ray
>
> Alex
>
>
> > > Thanks,
> > > Ray
> > >
> > > >
> > > > Anyway this patch is Reviewed-by: Prike Liang <Prike.Liang@amd.com>
> > > >
> > > > Thanks,
> > > > Prike
> > > > > -----Original Message-----
> > > > > From: Huang, Ray <Ray.Huang@amd.com>
> > > > > Sent: Tuesday, January 19, 2021 1:52 PM
> > > > > To: amd-gfx@lists.freedesktop.org
> > > > > Cc: Deucher, Alexander <Alexander.Deucher@amd.com>; Liang, Prike
> > > > > <Prike.Liang@amd.com>; Huang, Ray <Ray.Huang@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@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
> > > >
> > _______________________________________________
> > amd-gfx mailing list
> > amd-gfx@lists.freedesktop.org
> > https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7CRay.Huang%40amd.com%7C357c1e62ea18494c455e08d8bc84345c%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637466623291655763%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=qno95OlwKt81eiajh%2BDStj136Hx3%2BWKe8gai4MA4okA%3D&reserved=0
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-01-20 12:15 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-19 5:51 [PATCH] drm/amdgpu: remove gpu info firmware of green sardine Huang Rui
2021-01-19 6:25 ` Liang, Prike
2021-01-19 6:57 ` Huang Rui
2021-01-19 7:20 ` Liang, Prike
2021-01-19 14:11 ` Alex Deucher
2021-01-20 12:14 ` Huang Rui
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.