drm/amd/powerplay: add condition for smc table hw init

[linux-2.6-microblaze.git] / drivers / gpu / drm / amd / powerplay / amdgpu_smu.c

diff --git a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
index 0a9b873..231cce9 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
+++ b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
@@ -532,8 +532,14 @@ static int smu_fini_fb_allocations(struct smu_context *smu)
 static int smu_smc_table_hw_init(struct smu_context *smu,
                                 bool initialize)
 {
+       struct amdgpu_device *adev = smu->adev;
        int ret;
 
+       if (smu_is_dpm_running(smu) && adev->in_suspend) {
+               pr_info("dpm has been enabled\n");
+               return 0;
+       }
+
        ret = smu_init_display(smu);
        if (ret)
                return ret;
@@ -606,7 +612,7 @@ static int smu_smc_table_hw_init(struct smu_context *smu,
        if (ret)
                return ret;
 
-       ret = smu_feature_enable_all(smu);
+       ret = smu_system_features_control(smu, true);
        if (ret)
                return ret;
 
@@ -849,7 +855,7 @@ static int smu_suspend(void *handle)
        if (!is_support_sw_smu(adev))
                return -EINVAL;
 
-       ret = smu_feature_disable_all(smu);
+       ret = smu_system_features_control(smu, false);
        if (ret)
                return ret;