drm/amdgpu/powerplay: pp module only enable smu when dpm disabled.

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>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
index fa6baf31a35d..e2f0507eaac1 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
@@ -155,9 +155,6 @@ static int amdgpu_pp_sw_init(void *handle)
                 ret = adev->powerplay.ip_funcs->sw_init(
                                         adev->powerplay.pp_handle);
 
-        if (adev->pp_enabled)
-                adev->pm.dpm_enabled = true;
-
         return ret;
 }
 
@@ -187,6 +184,9 @@ static int amdgpu_pp_hw_init(void *handle)
                 ret = adev->powerplay.ip_funcs->hw_init(
                                         adev->powerplay.pp_handle);
 
+        if (amdgpu_dpm != 0)
+                adev->pm.dpm_enabled = true;
+
         return ret;
 }