aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHuang Rui <ray.huang@amd.com>2019-07-24 14:38:15 -0400
committerAlex Deucher <alexander.deucher@amd.com>2019-08-12 13:47:49 -0400
commitb51a26a02abe921e599971659e2177fd2c6a1e81 (patch)
tree0c031822597df90eaad8aa7a5eec28bca2772269
parent1eee4228a583b20082367e5cdce403bbdad2d7f1 (diff)
drm/amdgpu: add renoir support for gpu_info and ip block setting
This patch adds renoir support for gpu_info firmware and ip block setting. Acked-by: Huang Rui <ray.huang@amd.com> Signed-off-by: Huang Rui <ray.huang@amd.com> Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_device.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index dbe86e355ead..1c4cfd7ba446 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -71,6 +71,7 @@ MODULE_FIRMWARE("amdgpu/raven_gpu_info.bin");
71MODULE_FIRMWARE("amdgpu/picasso_gpu_info.bin"); 71MODULE_FIRMWARE("amdgpu/picasso_gpu_info.bin");
72MODULE_FIRMWARE("amdgpu/raven2_gpu_info.bin"); 72MODULE_FIRMWARE("amdgpu/raven2_gpu_info.bin");
73MODULE_FIRMWARE("amdgpu/arcturus_gpu_info.bin"); 73MODULE_FIRMWARE("amdgpu/arcturus_gpu_info.bin");
74MODULE_FIRMWARE("amdgpu/renoir_gpu_info.bin");
74MODULE_FIRMWARE("amdgpu/navi10_gpu_info.bin"); 75MODULE_FIRMWARE("amdgpu/navi10_gpu_info.bin");
75MODULE_FIRMWARE("amdgpu/navi14_gpu_info.bin"); 76MODULE_FIRMWARE("amdgpu/navi14_gpu_info.bin");
76MODULE_FIRMWARE("amdgpu/navi12_gpu_info.bin"); 77MODULE_FIRMWARE("amdgpu/navi12_gpu_info.bin");
@@ -1428,6 +1429,9 @@ static int amdgpu_device_parse_gpu_info_fw(struct amdgpu_device *adev)
1428 case CHIP_ARCTURUS: 1429 case CHIP_ARCTURUS:
1429 chip_name = "arcturus"; 1430 chip_name = "arcturus";
1430 break; 1431 break;
1432 case CHIP_RENOIR:
1433 chip_name = "renoir";
1434 break;
1431 case CHIP_NAVI10: 1435 case CHIP_NAVI10:
1432 chip_name = "navi10"; 1436 chip_name = "navi10";
1433 break; 1437 break;
@@ -1580,7 +1584,9 @@ static int amdgpu_device_ip_early_init(struct amdgpu_device *adev)
1580 case CHIP_VEGA20: 1584 case CHIP_VEGA20:
1581 case CHIP_RAVEN: 1585 case CHIP_RAVEN:
1582 case CHIP_ARCTURUS: 1586 case CHIP_ARCTURUS:
1583 if (adev->asic_type == CHIP_RAVEN) 1587 case CHIP_RENOIR:
1588 if (adev->asic_type == CHIP_RAVEN ||
1589 adev->asic_type == CHIP_RENOIR)
1584 adev->family = AMDGPU_FAMILY_RV; 1590 adev->family = AMDGPU_FAMILY_RV;
1585 else 1591 else
1586 adev->family = AMDGPU_FAMILY_AI; 1592 adev->family = AMDGPU_FAMILY_AI;