Skip to contentSkip to conversation

drm/amdgpu: remove gpu info firmware of green sardine

PATCH In review Huang Rui 3 participants 6 messages Jan 19, 2021 – Jan 20, 2021

Subsystems (2)
lore
Share & tools
lore

Huang Rui

author
#0 lore raw

PATCH 1/1 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.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1 -2
index 4d434803fb49..f1a426d8861d 100644
@@ -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";
Signature · 6 lines
2.25.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#1 lore raw

[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 <[email protected]>

Thanks,
Prike

Quoted 38 lines

-----Original Message-----
From: Huang, Ray <[email protected]>
Sent: Tuesday, January 19, 2021 1:52 PM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>; Liang, Prike <[email protected]>; Huang, Ray <[email protected]>
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.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1 -2
index 4d434803fb49..f1a426d8861d 100644
@@ -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:
Quoted 3 lines

chip_name = "navi10";
--
2.25.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

author
#2 lore raw
Quoted 3 lines · Prike

[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

Quoted 34 lines

Anyway this patch is Reviewed-by: Prike Liang <[email protected]>

Thanks,
Prike

Quoted 29 lines

-----Original Message-----
From: Huang, Ray <[email protected]>
Sent: Tuesday, January 19, 2021 1:52 PM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>; Liang, Prike <[email protected]>; Huang, Ray <[email protected]>
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.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0 -1
index 4d434803fb49..f1a426d8861d 100644
@@ -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
 
Quoted 13 lines
Quoted 9 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1 -1
@@ -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:
Quoted 3 lines

chip_name = "navi10";
--
2.25.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

#3 lore raw

[AMD Official Use Only - Internal Distribution Only]

Quoted 10 lines

-----Original Message-----
From: Huang, Ray <[email protected]>
Sent: Tuesday, January 19, 2021 2:57 PM
To: Liang, Prike <[email protected]>
Cc: [email protected]; Deucher, Alexander <[email protected]>
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:

Quoted 8 lines
Quoted 3 lines

[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.

Quoted 26 lines

Thanks,
Ray

Quoted 22 lines

Anyway this patch is Reviewed-by: Prike Liang <[email protected]>

Thanks,
Prike

Quoted 17 lines

-----Original Message-----
From: Huang, Ray <[email protected]>
Sent: Tuesday, January 19, 2021 1:52 PM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>; Liang, Prike <[email protected]>; Huang, Ray <[email protected]>
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.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
Quoted 25 lines
Quoted 6 lines

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0 -0
index 4d434803fb49..f1a426d8861d 100644
@@ -81,7 +81,6 @@

MODULE_FIRMWARE("amdgpu/navi10_gpu_info.bin");

Quoted 18 lines
Quoted 17 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0 -1
 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

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1 -2
-chip_name = "green_sardine";
+return 0;
 break;
 case CHIP_NAVI10:
 chip_name = "navi10";
--

2.25.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

#4 lore raw
Quoted 15 lines · Prike

[AMD Official Use Only - Internal Distribution Only]

Quoted 12 lines

-----Original Message-----
From: Huang, Ray <[email protected]>
Sent: Tuesday, January 19, 2021 2:57 PM
To: Liang, Prike <[email protected]>
Cc: [email protected]; Deucher, Alexander <[email protected]>
Subject: Re: [PATCH] drm/amdgpu: remove gpu info firmware of green sardine

Quoted 2 lines · Prike

[AMD Official Use Only - Internal Distribution Only]

Quoted 8 lines
Quoted 6 lines
Quoted 1 line

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.

Quoted 1 line

We can probably remove the renoir gpu_info firmware as well. We use the IP discovery table there as well at this point.

Alex

Quoted 50 lines
Quoted 25 lines

Thanks,
Ray

Quoted 22 lines

Anyway this patch is Reviewed-by: Prike Liang <[email protected]>

Thanks,
Prike

Quoted 17 lines

-----Original Message-----
From: Huang, Ray <[email protected]>
Sent: Tuesday, January 19, 2021 1:52 PM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>; Liang, Prike <[email protected]>; Huang, Ray <[email protected]>
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.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
Quoted 25 lines
Quoted 6 lines

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0 -0
index 4d434803fb49..f1a426d8861d 100644
@@ -81,7 +81,6 @@

MODULE_FIRMWARE("amdgpu/navi10_gpu_info.bin");

Quoted 18 lines
Quoted 17 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0 -1
 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

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1 -2
-chip_name = "green_sardine";
+return 0;
 break;
 case CHIP_NAVI10:
 chip_name = "navi10";
--

2.25.1

Quoted 4 lines

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

author
#5 lore raw
Quoted 20 lines · Alex Deucher
Quoted 19 lines · Prike

[AMD Official Use Only - Internal Distribution Only]

Quoted 16 lines

-----Original Message-----
From: Huang, Ray <[email protected]>
Sent: Tuesday, January 19, 2021 2:57 PM
To: Liang, Prike <[email protected]>
Cc: [email protected]; Deucher, Alexander <[email protected]>
Subject: Re: [PATCH] drm/amdgpu: remove gpu info firmware of green sardine

Quoted 3 lines · Prike

[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?

Quoted 7 lines
Quoted 4 lines
Quoted 2 lines

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.

Quoted 1 line

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

Quoted 58 lines

Alex

Quoted 54 lines
Quoted 25 lines

Thanks,
Ray

Quoted 22 lines

Anyway this patch is Reviewed-by: Prike Liang <[email protected]>

Thanks,
Prike

Quoted 17 lines

-----Original Message-----
From: Huang, Ray <[email protected]>
Sent: Tuesday, January 19, 2021 1:52 PM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>; Liang, Prike <[email protected]>; Huang, Ray <[email protected]>
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.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
Quoted 25 lines
Quoted 6 lines

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0 -0
index 4d434803fb49..f1a426d8861d 100644
@@ -81,7 +81,6 @@

MODULE_FIRMWARE("amdgpu/navi10_gpu_info.bin");

Quoted 18 lines
Quoted 17 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0 -1
 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

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1 -2
-chip_name = "green_sardine";
+return 0;
 break;
 case CHIP_NAVI10:
 chip_name = "navi10";
--

2.25.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&amp;data=04%7C01%7CRay.Huang%40amd.com%7C357c1e62ea18494c455e08d8bc84345c%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637466623291655763%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&amp;sdata=qno95OlwKt81eiajh%2BDStj136Hx3%2BWKe8gai4MA4okA%3D&amp;reserved=0

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx