Commit fac17723 authored by Alex Deucher's avatar Alex Deucher

drm/amdgpu/gfxhub2.1: convert to IP version checking

Use IP versions rather than asic_type to differentiate
IP version specific features.
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 524cf3ab
...@@ -506,8 +506,8 @@ static int gfxhub_v2_1_get_xgmi_info(struct amdgpu_device *adev) ...@@ -506,8 +506,8 @@ static int gfxhub_v2_1_get_xgmi_info(struct amdgpu_device *adev)
u32 max_num_physical_nodes = 0; u32 max_num_physical_nodes = 0;
u32 max_physical_node_id = 0; u32 max_physical_node_id = 0;
switch (adev->asic_type) { switch (adev->ip_versions[XGMI_HWIP]) {
case CHIP_SIENNA_CICHLID: case IP_VERSION(4, 8, 0):
max_num_physical_nodes = 4; max_num_physical_nodes = 4;
max_physical_node_id = 3; max_physical_node_id = 3;
break; break;
...@@ -544,7 +544,7 @@ static void gfxhub_v2_1_utcl2_harvest(struct amdgpu_device *adev) ...@@ -544,7 +544,7 @@ static void gfxhub_v2_1_utcl2_harvest(struct amdgpu_device *adev)
adev->gfx.config.max_sh_per_se * adev->gfx.config.max_sh_per_se *
adev->gfx.config.max_shader_engines); adev->gfx.config.max_shader_engines);
if (adev->asic_type == CHIP_YELLOW_CARP) { if (adev->ip_versions[GC_HWIP] == IP_VERSION(10, 3, 3)) {
/* Get SA disabled bitmap from eFuse setting */ /* Get SA disabled bitmap from eFuse setting */
efuse_setting = RREG32_SOC15(GC, 0, mmCC_GC_SA_UNIT_DISABLE); efuse_setting = RREG32_SOC15(GC, 0, mmCC_GC_SA_UNIT_DISABLE);
efuse_setting &= CC_GC_SA_UNIT_DISABLE__SA_DISABLE_MASK; efuse_setting &= CC_GC_SA_UNIT_DISABLE__SA_DISABLE_MASK;
......
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