drm/amd/powerplay: use smu7 hwmgr to manager iceland

Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

2 files changed, 27 insertions, 10 deletions

diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/Makefile b/drivers/gpu/drm/amd/powerplay/hwmgr/Makefile
index 69e6d156a4c3..5fff1d636ab7 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/Makefile
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/Makefile
@@ -7,9 +7,7 @@ HARDWARE_MGR = hwmgr.o processpptables.o functiontables.o \
                 cz_clockpowergating.o pppcielanes.o\
                 process_pptables_v1_0.o ppatomctrl.o \
                 smu7_hwmgr.o smu7_powertune.o smu7_thermal.o \
-                smu7_clockpowergating.o iceland_hwmgr.o \
-                iceland_clockpowergating.o iceland_thermal.o \
-                iceland_powertune.o
+                smu7_clockpowergating.o
 
 
 AMD_PP_HWMGR = $(addprefix $(AMD_PP_PATH)/hwmgr/,$(HARDWARE_MGR))
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
index 7ca8aaa88444..1167205057b3 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
@@ -36,13 +36,13 @@
 #include "amd_acpi.h"
 
 extern int cz_hwmgr_init(struct pp_hwmgr *hwmgr);
-extern int iceland_hwmgr_init(struct pp_hwmgr *hwmgr);
 
 static int polaris_set_asic_special_caps(struct pp_hwmgr *hwmgr);
 static void hwmgr_init_default_caps(struct pp_hwmgr *hwmgr);
 static int hwmgr_set_user_specify_caps(struct pp_hwmgr *hwmgr);
 static int fiji_set_asic_special_caps(struct pp_hwmgr *hwmgr);
 static int tonga_set_asic_special_caps(struct pp_hwmgr *hwmgr);
+static int topaz_set_asic_special_caps(struct pp_hwmgr *hwmgr);
 
 uint8_t convert_to_vid(uint16_t vddc)
 {
@@ -79,16 +79,18 @@ int hwmgr_init(struct amd_pp_init *pp_init, struct pp_instance *handle)
         case AMDGPU_FAMILY_VI:
                 switch (hwmgr->chip_id) {
                 case CHIP_TOPAZ:
-                        iceland_hwmgr_init(hwmgr);
+                        topaz_set_asic_special_caps(hwmgr);
+                        hwmgr->feature_mask &= ~(PP_SMC_VOLTAGE_CONTROL_MASK |
+                                                PP_VBI_TIME_SUPPORT_MASK |
+                                                PP_ENABLE_GFX_CG_THRU_SMU);
+                        hwmgr->pp_table_version = PP_TABLE_V0;
                         break;
                 case CHIP_TONGA:
-                        smu7_hwmgr_init(hwmgr);
                         tonga_set_asic_special_caps(hwmgr);
                         hwmgr->feature_mask &= ~(PP_SMC_VOLTAGE_CONTROL_MASK |
                                                 PP_VBI_TIME_SUPPORT_MASK);
                         break;
                 case CHIP_FIJI:
-                        smu7_hwmgr_init(hwmgr);
                         fiji_set_asic_special_caps(hwmgr);
                         hwmgr->feature_mask &= ~(PP_SMC_VOLTAGE_CONTROL_MASK |
                                                 PP_VBI_TIME_SUPPORT_MASK |
@@ -96,13 +98,13 @@ int hwmgr_init(struct amd_pp_init *pp_init, struct pp_instance *handle)
                         break;
                 case CHIP_POLARIS11:
                 case CHIP_POLARIS10:
-                        smu7_hwmgr_init(hwmgr);
                         polaris_set_asic_special_caps(hwmgr);
                         hwmgr->feature_mask &= ~(PP_UVD_HANDSHAKE_MASK);
                         break;
                 default:
                         return -EINVAL;
                 }
+                smu7_hwmgr_init(hwmgr);
                 break;
         default:
                 return -EINVAL;
@@ -215,8 +217,6 @@ int phm_wait_on_register(struct pp_hwmgr *hwmgr, uint32_t index,
 }
 
 
-
-
 /**
  * Returns once the part of the register indicated by the mask has
  * reached the given value.The indirect space is described by giving
@@ -794,3 +794,22 @@ int tonga_set_asic_special_caps(struct pp_hwmgr *hwmgr)
 
         return 0;
 }
+
+int topaz_set_asic_special_caps(struct pp_hwmgr *hwmgr)
+{
+        phm_cap_unset(hwmgr->platform_descriptor.platformCaps,
+                        PHM_PlatformCaps_SQRamping);
+        phm_cap_unset(hwmgr->platform_descriptor.platformCaps,
+                        PHM_PlatformCaps_DBRamping);
+        phm_cap_unset(hwmgr->platform_descriptor.platformCaps,
+                        PHM_PlatformCaps_TDRamping);
+        phm_cap_unset(hwmgr->platform_descriptor.platformCaps,
+                        PHM_PlatformCaps_TCPRamping);
+        phm_cap_set(hwmgr->platform_descriptor.platformCaps,
+                         PHM_PlatformCaps_TablelessHardwareInterface);
+        phm_cap_set(hwmgr->platform_descriptor.platformCaps,
+                        PHM_PlatformCaps_CAC);
+        phm_cap_set(hwmgr->platform_descriptor.platformCaps,
+                    PHM_PlatformCaps_EVV);
+        return 0;
+}