drm/amd/powerplay: refine code in amd_powerplay.c (v2)

1. use flag PP_DPM_DISABLED within powerplay
   notify amdgpu dpm state by cgs interface.
2. delete redundant virtualization check in
   powerplay

v2: squash in fix for hwmgr_init (Rex)

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

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
index 1649b1e3f23db08ac331a2fe70f9238ec3cc9d84..3b42f407971d29d0b2c59bcbf5cd661945e8ccb1 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
@@ -98,10 +98,6 @@ static int amdgpu_pp_early_init(void *handle)
                                        amd_pp->cgs_device ? amd_pp->cgs_device :
                                        amd_pp->pp_handle);
 
-       if (ret == PP_DPM_DISABLED) {
-               adev->pm.dpm_enabled = false;
-               return 0;
-       }
        return ret;
 }
 
@@ -154,14 +150,6 @@ static int amdgpu_pp_hw_init(void *handle)
                ret = adev->powerplay.ip_funcs->hw_init(
                                        adev->powerplay.pp_handle);
 
-       if (ret == PP_DPM_DISABLED) {
-               adev->pm.dpm_enabled = false;
-               return 0;
-       }
-
-       if ((amdgpu_dpm != 0) && !amdgpu_sriov_vf(adev))
-               adev->pm.dpm_enabled = true;
-
        return ret;
 }
 

diff --git a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
index 488347a11f011570720e009edd17f72c231b6589..38ae400c3a351688d2bf294864db3fe7e59ee0ce 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
+++ b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
@@ -30,6 +30,8 @@
 #include "pp_instance.h"
 #include "power_state.h"
 
+#define PP_DPM_DISABLED 0xCCCC
+
 static int pp_dpm_dispatch_tasks(void *handle, enum amd_pp_task task_id,
                void *input, void *output);
 
@@ -99,10 +101,6 @@ static int pp_early_init(void *handle)
        if (ret)
                return -EINVAL;
 
-       if ((pp_handle->pm_en == 0)
-               || cgs_is_virtualization_enabled(pp_handle->device))
-               return PP_DPM_DISABLED;
-
        return 0;
 }
 
@@ -114,7 +112,7 @@ static int pp_sw_init(void *handle)
 
        ret = pp_check(pp_handle);
 
-       if (ret == 0 || ret == PP_DPM_DISABLED) {
+       if (ret >= 0) {
                hwmgr = pp_handle->hwmgr;
 
                if (hwmgr->smumgr_funcs->smu_init == NULL)
@@ -134,7 +132,7 @@ static int pp_sw_fini(void *handle)
        struct pp_instance *pp_handle = (struct pp_instance *)handle;
 
        ret = pp_check(pp_handle);
-       if (ret == 0 || ret == PP_DPM_DISABLED) {
+       if (ret >= 0) {
                hwmgr = pp_handle->hwmgr;
 
                if (hwmgr->smumgr_funcs->smu_fini == NULL)
@@ -153,7 +151,7 @@ static int pp_hw_init(void *handle)
 
        ret = pp_check(pp_handle);
 
-       if (ret == 0 || ret == PP_DPM_DISABLED) {
+       if (ret >= 0) {
                hwmgr = pp_handle->hwmgr;
 
                if (hwmgr->smumgr_funcs->start_smu == NULL)
@@ -165,16 +163,17 @@ static int pp_hw_init(void *handle)
                        return -EINVAL;;
                }
                if (ret == PP_DPM_DISABLED)
-                       return PP_DPM_DISABLED;
+                       goto exit;
+               ret = hwmgr_hw_init(pp_handle);
+               if (ret)
+                       goto exit;
        }
-
-       ret = hwmgr_hw_init(pp_handle);
-       if (ret)
-               goto err;
-       return 0;
-err:
+       return ret;
+exit:
        pp_handle->pm_en = 0;
-       return PP_DPM_DISABLED;
+       cgs_notify_dpm_enabled(hwmgr->device, false);
+       return 0;
+
 }
 
 static int pp_hw_fini(void *handle)
@@ -275,39 +274,34 @@ static int pp_suspend(void *handle)
        int ret = 0;
 
        ret = pp_check(pp_handle);
-
-       if (ret == PP_DPM_DISABLED)
-               return 0;
-       else if (ret != 0)
-               return ret;
-
-       return hwmgr_hw_suspend(pp_handle);
+       if (ret == 0)
+               hwmgr_hw_suspend(pp_handle);
+       return 0;
 }
 
 static int pp_resume(void *handle)
 {
        struct pp_hwmgr  *hwmgr;
-       int ret, ret1;
+       int ret;
        struct pp_instance *pp_handle = (struct pp_instance *)handle;
 
-       ret1 = pp_check(pp_handle);
+       ret = pp_check(pp_handle);
 
-       if (ret1 != 0 && ret1 != PP_DPM_DISABLED)
-               return ret1;
+       if (ret < 0)
+               return ret;
 
        hwmgr = pp_handle->hwmgr;
 
        if (hwmgr->smumgr_funcs->start_smu == NULL)
                return -EINVAL;
 
-       ret = hwmgr->smumgr_funcs->start_smu(pp_handle->hwmgr);
-       if (ret) {
+       if (hwmgr->smumgr_funcs->start_smu(pp_handle->hwmgr)) {
                pr_err("smc start failed\n");
                hwmgr->smumgr_funcs->smu_fini(pp_handle->hwmgr);
-               return ret;
+               return -EINVAL;
        }
 
-       if (ret1 == PP_DPM_DISABLED)
+       if (ret == PP_DPM_DISABLED)
                return 0;
 
        return hwmgr_hw_resume(pp_handle);
@@ -1190,9 +1184,6 @@ int amd_powerplay_reset(void *handle)
        struct pp_instance *instance = (struct pp_instance *)handle;
        int ret;
 
-       if (cgs_is_virtualization_enabled(instance->hwmgr->device))
-               return PP_DPM_DISABLED;
-
        ret = pp_check(instance);
        if (ret != 0)
                return ret;
@@ -1203,7 +1194,7 @@ int amd_powerplay_reset(void *handle)
 
        ret = hwmgr_hw_init(instance);
        if (ret)
-               return PP_DPM_DISABLED;
+               return ret;
 
        return hwmgr_handle_task(instance, AMD_PP_TASK_COMPLETE_INIT, NULL, NULL);
 }

diff --git a/drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h b/drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h
index 916b6c420ea4e986f14b2a53c54b082a0e9dd06e..e52adc873413c984c6aa72ebce90f891b33c29cb 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h
+++ b/drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h
@@ -33,8 +33,6 @@
 extern const struct amd_ip_funcs pp_ip_funcs;
 extern const struct amd_pm_funcs pp_dpm_funcs;
 
-#define PP_DPM_DISABLED 0xCCCC
-
 enum amd_pp_sensors {
        AMDGPU_PP_SENSOR_GFX_SCLK = 0,
        AMDGPU_PP_SENSOR_VDDNB,