1 files changed, 7 insertions, 3 deletions

diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
index 20f20e075588..27e07624ac28 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
@@ -24,6 +24,7 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
+#include <drm/amdgpu_drm.h>
 #include "cgs_common.h"
 #include "power_state.h"
 #include "hwmgr.h"
@@ -58,12 +59,13 @@ int hwmgr_init(struct amd_pp_init *pp_init, struct pp_instance *handle)
         hwmgr->hw_revision = pp_init->rev_id;
         hwmgr->usec_timeout = AMD_MAX_USEC_TIMEOUT;
         hwmgr->power_source = PP_PowerSource_AC;
+        hwmgr->powercontainment_enabled = pp_init->powercontainment_enabled;
 
         switch (hwmgr->chip_family) {
-        case AMD_FAMILY_CZ:
+        case AMDGPU_FAMILY_CZ:
                 cz_hwmgr_init(hwmgr);
                 break;
-        case AMD_FAMILY_VI:
+        case AMDGPU_FAMILY_VI:
                 switch (hwmgr->chip_id) {
                 case CHIP_TONGA:
                         tonga_hwmgr_init(hwmgr);
@@ -94,6 +96,8 @@ int hwmgr_fini(struct pp_hwmgr *hwmgr)
                 return -EINVAL;
 
         /* do hwmgr finish*/
+        kfree(hwmgr->hardcode_pp_table);
+
         kfree(hwmgr->backend);
 
         kfree(hwmgr->start_thermal_controller.function_list);
@@ -530,7 +534,7 @@ int phm_initializa_dynamic_state_adjustment_rule_settings(struct pp_hwmgr *hwmgr
 
         /* initialize vddc_dep_on_dal_pwrl table */
         table_size = sizeof(uint32_t) + 4 * sizeof(struct phm_clock_voltage_dependency_record);
-        table_clk_vlt = (struct phm_clock_voltage_dependency_table *)kzalloc(table_size, GFP_KERNEL);
+        table_clk_vlt = kzalloc(table_size, GFP_KERNEL);
 
         if (NULL == table_clk_vlt) {
                 printk(KERN_ERR "[ powerplay ] Can not allocate space for vddc_dep_on_dal_pwrl! \n");