Commit 23c1ea02 authored by Tim Huang's avatar Tim Huang Committed by Alex Deucher

drm/amdgpu: add GC IP v11.5.2 to GC 11.5.0 family

This patch is to add GC 11.5.2 to GC 11.5.0 family.
Signed-off-by: default avatarTim Huang <Tim.Huang@amd.com>
Reviewed-by: default avatarYifan Zhang <yifan1.zhang@amd.com>
Reviewed-by: default avatarVeerabadhran Gopalakrishnan <Veerabadhran.Gopalakrishnan@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 43e4cc22
...@@ -1808,6 +1808,7 @@ static int amdgpu_discovery_set_common_ip_blocks(struct amdgpu_device *adev) ...@@ -1808,6 +1808,7 @@ static int amdgpu_discovery_set_common_ip_blocks(struct amdgpu_device *adev)
case IP_VERSION(11, 0, 4): case IP_VERSION(11, 0, 4):
case IP_VERSION(11, 5, 0): case IP_VERSION(11, 5, 0):
case IP_VERSION(11, 5, 1): case IP_VERSION(11, 5, 1):
case IP_VERSION(11, 5, 2):
amdgpu_device_ip_block_add(adev, &soc21_common_ip_block); amdgpu_device_ip_block_add(adev, &soc21_common_ip_block);
break; break;
case IP_VERSION(12, 0, 0): case IP_VERSION(12, 0, 0):
...@@ -1861,6 +1862,7 @@ static int amdgpu_discovery_set_gmc_ip_blocks(struct amdgpu_device *adev) ...@@ -1861,6 +1862,7 @@ static int amdgpu_discovery_set_gmc_ip_blocks(struct amdgpu_device *adev)
case IP_VERSION(11, 0, 4): case IP_VERSION(11, 0, 4):
case IP_VERSION(11, 5, 0): case IP_VERSION(11, 5, 0):
case IP_VERSION(11, 5, 1): case IP_VERSION(11, 5, 1):
case IP_VERSION(11, 5, 2):
amdgpu_device_ip_block_add(adev, &gmc_v11_0_ip_block); amdgpu_device_ip_block_add(adev, &gmc_v11_0_ip_block);
break; break;
case IP_VERSION(12, 0, 0): case IP_VERSION(12, 0, 0):
...@@ -2152,6 +2154,7 @@ static int amdgpu_discovery_set_gc_ip_blocks(struct amdgpu_device *adev) ...@@ -2152,6 +2154,7 @@ static int amdgpu_discovery_set_gc_ip_blocks(struct amdgpu_device *adev)
case IP_VERSION(11, 0, 4): case IP_VERSION(11, 0, 4):
case IP_VERSION(11, 5, 0): case IP_VERSION(11, 5, 0):
case IP_VERSION(11, 5, 1): case IP_VERSION(11, 5, 1):
case IP_VERSION(11, 5, 2):
amdgpu_device_ip_block_add(adev, &gfx_v11_0_ip_block); amdgpu_device_ip_block_add(adev, &gfx_v11_0_ip_block);
break; break;
case IP_VERSION(12, 0, 0): case IP_VERSION(12, 0, 0):
...@@ -2325,6 +2328,7 @@ static int amdgpu_discovery_set_mes_ip_blocks(struct amdgpu_device *adev) ...@@ -2325,6 +2328,7 @@ static int amdgpu_discovery_set_mes_ip_blocks(struct amdgpu_device *adev)
case IP_VERSION(11, 0, 4): case IP_VERSION(11, 0, 4):
case IP_VERSION(11, 5, 0): case IP_VERSION(11, 5, 0):
case IP_VERSION(11, 5, 1): case IP_VERSION(11, 5, 1):
case IP_VERSION(11, 5, 2):
amdgpu_device_ip_block_add(adev, &mes_v11_0_ip_block); amdgpu_device_ip_block_add(adev, &mes_v11_0_ip_block);
adev->enable_mes = true; adev->enable_mes = true;
adev->enable_mes_kiq = true; adev->enable_mes_kiq = true;
...@@ -2634,6 +2638,7 @@ int amdgpu_discovery_set_ip_blocks(struct amdgpu_device *adev) ...@@ -2634,6 +2638,7 @@ int amdgpu_discovery_set_ip_blocks(struct amdgpu_device *adev)
break; break;
case IP_VERSION(11, 5, 0): case IP_VERSION(11, 5, 0):
case IP_VERSION(11, 5, 1): case IP_VERSION(11, 5, 1):
case IP_VERSION(11, 5, 2):
adev->family = AMDGPU_FAMILY_GC_11_5_0; adev->family = AMDGPU_FAMILY_GC_11_5_0;
break; break;
case IP_VERSION(12, 0, 0): case IP_VERSION(12, 0, 0):
...@@ -2658,6 +2663,7 @@ int amdgpu_discovery_set_ip_blocks(struct amdgpu_device *adev) ...@@ -2658,6 +2663,7 @@ int amdgpu_discovery_set_ip_blocks(struct amdgpu_device *adev)
case IP_VERSION(11, 0, 4): case IP_VERSION(11, 0, 4):
case IP_VERSION(11, 5, 0): case IP_VERSION(11, 5, 0):
case IP_VERSION(11, 5, 1): case IP_VERSION(11, 5, 1):
case IP_VERSION(11, 5, 2):
adev->flags |= AMD_IS_APU; adev->flags |= AMD_IS_APU;
break; break;
default: default:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment