amd/powerplay: update the vcn pg

update the vcn pg function in navi10.

Signed-off-by: Kenneth Feng <kenneth.feng@amd.com>
Reviewed-by: Evan Quan <evan.quan@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
index b62d272380d54f306bae0074fbf56f7a8ee7b8da..a4812c05c09c15b923bf6c3c9bc160edcc21841c 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
+++ b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
@@ -439,9 +439,15 @@ struct smu_dpm_context {
        struct mclock_latency_table *mclk_latency_table;
 };
 
+struct smu_power_gate {
+       bool uvd_gated;
+       bool vce_gated;
+};
+
 struct smu_power_context {
        void *power_context;
        uint32_t power_context_size;
+       struct smu_power_gate power_gate;
 };
 
 

diff --git a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c b/drivers/gpu/drm/amd/powerplay/navi10_ppt.c
index 02054874de2f24e82509a0615fc7e69846d35e6c..e705067b4dd291e1b3f83728479a03c6b719cba9 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c
+++ b/drivers/gpu/drm/amd/powerplay/navi10_ppt.c
@@ -521,15 +521,21 @@ static int navi10_set_default_dpm_table(struct smu_context *smu)
 static int navi10_dpm_set_uvd_enable(struct smu_context *smu, bool enable)
 {
        int ret = 0;
+       struct smu_power_context *smu_power = &smu->smu_power;
+       struct smu_power_gate *power_gate = &smu_power->power_gate;
 
-       if (enable) {
+       if (enable && power_gate->uvd_gated) {
                ret = smu_send_smc_msg_with_param(smu, SMU_MSG_PowerUpVcn, 1);
                if (ret)
                        return ret;
+               power_gate->uvd_gated = false;
        } else {
-               ret = smu_send_smc_msg(smu, SMU_MSG_PowerDownVcn);
-               if (ret)
-                       return ret;
+               if (!enable && !power_gate->uvd_gated) {
+                       ret = smu_send_smc_msg(smu, SMU_MSG_PowerDownVcn);
+                       if (ret)
+                               return ret;
+                       power_gate->uvd_gated = true;
+               }
        }
 
        return 0;