Skip to content

Commit 0c70141

Browse files
Jiansong Chenalexdeucher
authored andcommitted
drm/amdgpu: remove gpu_info fw support for sienna_cichlid etc.
Remove gpu_info fw support for sienna_cichlid etc., since the information can be retrieved from discovery binary. Signed-off-by: Jiansong Chen <Jiansong.Chen@amd.com> Reviewed-by: Likun Gao <Likun.Gao@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent 97cf329 commit 0c70141

1 file changed

Lines changed: 2 additions & 8 deletions

File tree

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,6 @@ MODULE_FIRMWARE("amdgpu/renoir_gpu_info.bin");
8080
MODULE_FIRMWARE("amdgpu/navi10_gpu_info.bin");
8181
MODULE_FIRMWARE("amdgpu/navi14_gpu_info.bin");
8282
MODULE_FIRMWARE("amdgpu/navi12_gpu_info.bin");
83-
MODULE_FIRMWARE("amdgpu/sienna_cichlid_gpu_info.bin");
84-
MODULE_FIRMWARE("amdgpu/navy_flounder_gpu_info.bin");
8583

8684
#define AMDGPU_RESUME_MS 2000
8785

@@ -1600,6 +1598,8 @@ static int amdgpu_device_parse_gpu_info_fw(struct amdgpu_device *adev)
16001598
case CHIP_CARRIZO:
16011599
case CHIP_STONEY:
16021600
case CHIP_VEGA20:
1601+
case CHIP_SIENNA_CICHLID:
1602+
case CHIP_NAVY_FLOUNDER:
16031603
default:
16041604
return 0;
16051605
case CHIP_VEGA10:
@@ -1631,12 +1631,6 @@ static int amdgpu_device_parse_gpu_info_fw(struct amdgpu_device *adev)
16311631
case CHIP_NAVI12:
16321632
chip_name = "navi12";
16331633
break;
1634-
case CHIP_SIENNA_CICHLID:
1635-
chip_name = "sienna_cichlid";
1636-
break;
1637-
case CHIP_NAVY_FLOUNDER:
1638-
chip_name = "navy_flounder";
1639-
break;
16401634
}
16411635

16421636
snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_gpu_info.bin", chip_name);

0 commit comments

Comments
 (0)