All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/3] drm/amdgpu: remove unused gpu_info firmwares
@ 2022-03-01 16:01 Alex Deucher
  2022-03-01 16:01 ` [PATCH 2/3] drm/amdgpu/gfx10: drop unused cyan skillfish firmware Alex Deucher
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Alex Deucher @ 2022-03-01 16:01 UTC (permalink / raw)
  To: amd-gfx; +Cc: Alex Deucher

These were leftover from bring up and are no longer
necessary.  The information is available via
the IP discovery table.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 23 ----------------------
 1 file changed, 23 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 6113ddc765a7..2f732a1758d6 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -80,12 +80,7 @@ MODULE_FIRMWARE("amdgpu/raven_gpu_info.bin");
 MODULE_FIRMWARE("amdgpu/picasso_gpu_info.bin");
 MODULE_FIRMWARE("amdgpu/raven2_gpu_info.bin");
 MODULE_FIRMWARE("amdgpu/arcturus_gpu_info.bin");
-MODULE_FIRMWARE("amdgpu/renoir_gpu_info.bin");
-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/yellow_carp_gpu_info.bin");
 
 #define AMDGPU_RESUME_MS		2000
 #define AMDGPU_MAX_RETRY_LIMIT		2
@@ -1992,27 +1987,9 @@ static int amdgpu_device_parse_gpu_info_fw(struct amdgpu_device *adev)
 	case CHIP_ARCTURUS:
 		chip_name = "arcturus";
 		break;
-	case CHIP_RENOIR:
-		if (adev->apu_flags & AMD_APU_IS_RENOIR)
-			chip_name = "renoir";
-		else
-			chip_name = "green_sardine";
-		break;
-	case CHIP_NAVI10:
-		chip_name = "navi10";
-		break;
-	case CHIP_NAVI14:
-		chip_name = "navi14";
-		break;
 	case CHIP_NAVI12:
 		chip_name = "navi12";
 		break;
-	case CHIP_VANGOGH:
-		chip_name = "vangogh";
-		break;
-	case CHIP_YELLOW_CARP:
-		chip_name = "yellow_carp";
-		break;
 	}
 
 	snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_gpu_info.bin", chip_name);
-- 
2.35.1


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [PATCH 2/3] drm/amdgpu/gfx10: drop unused cyan skillfish firmware
  2022-03-01 16:01 [PATCH 1/3] drm/amdgpu: remove unused gpu_info firmwares Alex Deucher
@ 2022-03-01 16:01 ` Alex Deucher
  2022-03-01 16:01 ` [PATCH 3/3] drm/amdgpu/sdma5: " Alex Deucher
  2022-03-02  8:35 ` [PATCH 1/3] drm/amdgpu: remove unused gpu_info firmwares Christian König
  2 siblings, 0 replies; 4+ messages in thread
From: Alex Deucher @ 2022-03-01 16:01 UTC (permalink / raw)
  To: amd-gfx; +Cc: Alex Deucher

Leftover from bring up.  Not used anymore.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
index 90158289cd30..0f350a5c4bf2 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
@@ -250,13 +250,6 @@ MODULE_FIRMWARE("amdgpu/yellow_carp_mec.bin");
 MODULE_FIRMWARE("amdgpu/yellow_carp_mec2.bin");
 MODULE_FIRMWARE("amdgpu/yellow_carp_rlc.bin");
 
-MODULE_FIRMWARE("amdgpu/cyan_skillfish_ce.bin");
-MODULE_FIRMWARE("amdgpu/cyan_skillfish_pfp.bin");
-MODULE_FIRMWARE("amdgpu/cyan_skillfish_me.bin");
-MODULE_FIRMWARE("amdgpu/cyan_skillfish_mec.bin");
-MODULE_FIRMWARE("amdgpu/cyan_skillfish_mec2.bin");
-MODULE_FIRMWARE("amdgpu/cyan_skillfish_rlc.bin");
-
 MODULE_FIRMWARE("amdgpu/cyan_skillfish2_ce.bin");
 MODULE_FIRMWARE("amdgpu/cyan_skillfish2_pfp.bin");
 MODULE_FIRMWARE("amdgpu/cyan_skillfish2_me.bin");
@@ -4043,10 +4036,7 @@ static int gfx_v10_0_init_microcode(struct amdgpu_device *adev)
 		break;
 	case IP_VERSION(10, 1, 3):
 	case IP_VERSION(10, 1, 4):
-		if (adev->apu_flags & AMD_APU_IS_CYAN_SKILLFISH2)
-			chip_name = "cyan_skillfish2";
-		else
-			chip_name = "cyan_skillfish";
+		chip_name = "cyan_skillfish2";
 		break;
 	case IP_VERSION(10, 3, 7):
 		chip_name = "gc_10_3_7";
-- 
2.35.1


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [PATCH 3/3] drm/amdgpu/sdma5: drop unused cyan skillfish firmware
  2022-03-01 16:01 [PATCH 1/3] drm/amdgpu: remove unused gpu_info firmwares Alex Deucher
  2022-03-01 16:01 ` [PATCH 2/3] drm/amdgpu/gfx10: drop unused cyan skillfish firmware Alex Deucher
@ 2022-03-01 16:01 ` Alex Deucher
  2022-03-02  8:35 ` [PATCH 1/3] drm/amdgpu: remove unused gpu_info firmwares Christian König
  2 siblings, 0 replies; 4+ messages in thread
From: Alex Deucher @ 2022-03-01 16:01 UTC (permalink / raw)
  To: amd-gfx; +Cc: Alex Deucher

Leftover from bring up.  Not used anymore.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c
index 81e033549dda..53a8df4b030e 100644
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c
@@ -51,9 +51,6 @@ MODULE_FIRMWARE("amdgpu/navi14_sdma1.bin");
 MODULE_FIRMWARE("amdgpu/navi12_sdma.bin");
 MODULE_FIRMWARE("amdgpu/navi12_sdma1.bin");
 
-MODULE_FIRMWARE("amdgpu/cyan_skillfish_sdma.bin");
-MODULE_FIRMWARE("amdgpu/cyan_skillfish_sdma1.bin");
-
 MODULE_FIRMWARE("amdgpu/cyan_skillfish2_sdma.bin");
 MODULE_FIRMWARE("amdgpu/cyan_skillfish2_sdma1.bin");
 
@@ -264,10 +261,7 @@ static int sdma_v5_0_init_microcode(struct amdgpu_device *adev)
 		chip_name = "navi12";
 		break;
 	case IP_VERSION(5, 0, 1):
-		if (adev->apu_flags & AMD_APU_IS_CYAN_SKILLFISH2)
-			chip_name = "cyan_skillfish2";
-		else
-			chip_name = "cyan_skillfish";
+		chip_name = "cyan_skillfish2";
 		break;
 	default:
 		BUG();
-- 
2.35.1


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [PATCH 1/3] drm/amdgpu: remove unused gpu_info firmwares
  2022-03-01 16:01 [PATCH 1/3] drm/amdgpu: remove unused gpu_info firmwares Alex Deucher
  2022-03-01 16:01 ` [PATCH 2/3] drm/amdgpu/gfx10: drop unused cyan skillfish firmware Alex Deucher
  2022-03-01 16:01 ` [PATCH 3/3] drm/amdgpu/sdma5: " Alex Deucher
@ 2022-03-02  8:35 ` Christian König
  2 siblings, 0 replies; 4+ messages in thread
From: Christian König @ 2022-03-02  8:35 UTC (permalink / raw)
  To: Alex Deucher, amd-gfx

Am 01.03.22 um 17:01 schrieb Alex Deucher:
> These were leftover from bring up and are no longer
> necessary.  The information is available via
> the IP discovery table.
>
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

Acked-by: Christian König <christian.koenig@amd.com> for the whole series.

> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 23 ----------------------
>   1 file changed, 23 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> index 6113ddc765a7..2f732a1758d6 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> @@ -80,12 +80,7 @@ MODULE_FIRMWARE("amdgpu/raven_gpu_info.bin");
>   MODULE_FIRMWARE("amdgpu/picasso_gpu_info.bin");
>   MODULE_FIRMWARE("amdgpu/raven2_gpu_info.bin");
>   MODULE_FIRMWARE("amdgpu/arcturus_gpu_info.bin");
> -MODULE_FIRMWARE("amdgpu/renoir_gpu_info.bin");
> -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/yellow_carp_gpu_info.bin");
>   
>   #define AMDGPU_RESUME_MS		2000
>   #define AMDGPU_MAX_RETRY_LIMIT		2
> @@ -1992,27 +1987,9 @@ static int amdgpu_device_parse_gpu_info_fw(struct amdgpu_device *adev)
>   	case CHIP_ARCTURUS:
>   		chip_name = "arcturus";
>   		break;
> -	case CHIP_RENOIR:
> -		if (adev->apu_flags & AMD_APU_IS_RENOIR)
> -			chip_name = "renoir";
> -		else
> -			chip_name = "green_sardine";
> -		break;
> -	case CHIP_NAVI10:
> -		chip_name = "navi10";
> -		break;
> -	case CHIP_NAVI14:
> -		chip_name = "navi14";
> -		break;
>   	case CHIP_NAVI12:
>   		chip_name = "navi12";
>   		break;
> -	case CHIP_VANGOGH:
> -		chip_name = "vangogh";
> -		break;
> -	case CHIP_YELLOW_CARP:
> -		chip_name = "yellow_carp";
> -		break;
>   	}
>   
>   	snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_gpu_info.bin", chip_name);


^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-03-02  8:35 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-01 16:01 [PATCH 1/3] drm/amdgpu: remove unused gpu_info firmwares Alex Deucher
2022-03-01 16:01 ` [PATCH 2/3] drm/amdgpu/gfx10: drop unused cyan skillfish firmware Alex Deucher
2022-03-01 16:01 ` [PATCH 3/3] drm/amdgpu/sdma5: " Alex Deucher
2022-03-02  8:35 ` [PATCH 1/3] drm/amdgpu: remove unused gpu_info firmwares Christian König

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.