]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
drm/amdgpu/gfxhub2.1: convert to IP version checking
authorAlex Deucher <alexander.deucher@amd.com>
Tue, 27 Jul 2021 20:05:41 +0000 (16:05 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Mon, 4 Oct 2021 19:22:59 +0000 (15:22 -0400)
Use IP versions rather than asic_type to differentiate
IP version specific features.

Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.c

index 1a374ec0514a515d710878733ec58da132cbe890..149f3843e0e7e415610d0bc7590ce4ff52417d6a 100644 (file)
@@ -506,8 +506,8 @@ static int gfxhub_v2_1_get_xgmi_info(struct amdgpu_device *adev)
        u32 max_num_physical_nodes   = 0;
        u32 max_physical_node_id     = 0;
 
-       switch (adev->asic_type) {
-       case CHIP_SIENNA_CICHLID:
+       switch (adev->ip_versions[XGMI_HWIP]) {
+       case IP_VERSION(4, 8, 0):
                max_num_physical_nodes   = 4;
                max_physical_node_id     = 3;
                break;
@@ -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_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 */
                efuse_setting = RREG32_SOC15(GC, 0, mmCC_GC_SA_UNIT_DISABLE);
                efuse_setting &= CC_GC_SA_UNIT_DISABLE__SA_DISABLE_MASK;