drm/amdgpu/cz: force uvd clocks when sclks are forced

Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

1 files changed, 24 insertions, 0 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/cz_dpm.c b/drivers/gpu/drm/amd/amdgpu/cz_dpm.c
index 02cba49f13a8..bdf5a22ba450 100644
--- a/drivers/gpu/drm/amd/amdgpu/cz_dpm.c
+++ b/drivers/gpu/drm/amd/amdgpu/cz_dpm.c
@@ -1971,25 +1971,49 @@ static int cz_dpm_force_dpm_level(struct amdgpu_device *adev,
 
         switch (level) {
         case AMDGPU_DPM_FORCED_LEVEL_HIGH:
+                /* sclk */
                 ret = cz_dpm_unforce_dpm_levels(adev);
                 if (ret)
                         return ret;
                 ret = cz_dpm_force_highest(adev);
                 if (ret)
                         return ret;
+
+                /* uvd */
+                ret = cz_dpm_unforce_uvd_dpm_levels(adev);
+                if (ret)
+                        return ret;
+                ret = cz_dpm_uvd_force_highest(adev);
+                if (ret)
+                        return ret;
                 break;
         case AMDGPU_DPM_FORCED_LEVEL_LOW:
+                /* sclk */
                 ret = cz_dpm_unforce_dpm_levels(adev);
                 if (ret)
                         return ret;
                 ret = cz_dpm_force_lowest(adev);
                 if (ret)
                         return ret;
+
+                /* uvd */
+                ret = cz_dpm_unforce_uvd_dpm_levels(adev);
+                if (ret)
+                        return ret;
+                ret = cz_dpm_uvd_force_lowest(adev);
+                if (ret)
+                        return ret;
                 break;
         case AMDGPU_DPM_FORCED_LEVEL_AUTO:
+                /* sclk */
                 ret = cz_dpm_unforce_dpm_levels(adev);
                 if (ret)
                         return ret;
+
+                /* uvd */
+                ret = cz_dpm_unforce_uvd_dpm_levels(adev);
+                if (ret)
+                        return ret;
                 break;
         default:
                 break;