aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTao Zhou <[email protected]>2020-10-09 18:39:48 -0400
committerAlex Deucher <[email protected]>2020-10-12 14:02:46 -0400
commiteac88a5fc63166917278a085e50039d1dd04c9a3 (patch)
treebaa0ab76c751d30e5681a6713c7822e7f8e61648
parent8e3bfb992c1bcddcf99910c9fea40a9d9c6c62e6 (diff)
drm/amdgpu: remove gpu_info fw support for dimgrey_cavefish
Remove gpu_info fw support for dimgrey_cavefish, gpu info can be got from ip discovery. Signed-off-by: Tao Zhou <[email protected]> Reviewed-by: Jiansong Chen <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_device.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 9cf1cb6f49e5..8758d59aa20c 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -82,7 +82,6 @@ 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");
-MODULE_FIRMWARE("amdgpu/dimgrey_cavefish_gpu_info.bin");
#define AMDGPU_RESUME_MS 2000
@@ -1788,6 +1787,7 @@ static int amdgpu_device_parse_gpu_info_fw(struct amdgpu_device *adev)
case CHIP_VEGA20:
case CHIP_SIENNA_CICHLID:
case CHIP_NAVY_FLOUNDER:
+ case CHIP_DIMGREY_CAVEFISH:
default:
return 0;
case CHIP_VEGA10:
@@ -1825,9 +1825,6 @@ static int amdgpu_device_parse_gpu_info_fw(struct amdgpu_device *adev)
case CHIP_VANGOGH:
chip_name = "vangogh";
break;
- case CHIP_DIMGREY_CAVEFISH:
- chip_name = "dimgrey_cavefish";
- break;
}
snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_gpu_info.bin", chip_name);