drm/amdgpu: fix modprobe failure for uvd_4/5/6

For uvd_4/5/6, amdgpu driver will only power on them when
there are jobs assigned to decode/enc rings.uvd_4/5/6 dpm was broken
since amdgpu_dpm_set_powergating_by_smu only covers gfx block.

The change would add more IP block support in amdgpu_dpm_set_powergating_by_smu
For GFX/UVD/VCN/VCE, if the new SMU driver is supported, invoke new
power gate helper function smu_dpm_set_power_gate, otherwise, fallback to
legacy powerplay helper function pp_set_powergating_by_smu. For other IP blocks
always invoke legacy powerplay helper function.

Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: Tianci Yin <tianci.yin@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

1 files changed, 10 insertions, 1 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c
index 6c2ec8123178..f082b2547b83 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c
@@ -946,12 +946,21 @@ int amdgpu_dpm_set_powergating_by_smu(struct amdgpu_device *adev, uint32_t block
 
         switch (block_type) {
         case AMD_IP_BLOCK_TYPE_GFX:
+        case AMD_IP_BLOCK_TYPE_UVD:
+        case AMD_IP_BLOCK_TYPE_VCN:
+        case AMD_IP_BLOCK_TYPE_VCE:
                 if (swsmu)
-                        ret = smu_gfx_off_control(&adev->smu, gate);
+                        ret = smu_dpm_set_power_gate(&adev->smu, block_type, gate);
                 else
                         ret = ((adev)->powerplay.pp_funcs->set_powergating_by_smu(
                                 (adev)->powerplay.pp_handle, block_type, gate));
                 break;
+        case AMD_IP_BLOCK_TYPE_GMC:
+        case AMD_IP_BLOCK_TYPE_ACP:
+        case AMD_IP_BLOCK_TYPE_SDMA:
+                ret = ((adev)->powerplay.pp_funcs->set_powergating_by_smu(
+                                (adev)->powerplay.pp_handle, block_type, gate));
+                break;
         default:
                 break;
         }