]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
drm/amdgpu: Remove dead code in amdgpu_pm.c
authorRex Zhu <Rex.Zhu@amd.com>
Thu, 23 Aug 2018 07:45:15 +0000 (15:45 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Mon, 27 Aug 2018 20:11:22 +0000 (15:11 -0500)
As we have unify powergate_uvd/vce/mmhub to set_powergating_by_smu,
and set_powergating_by_smu was supported by both dpm and powerplay.
so remove the else case.

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c

index 3e51e9c89f042218153343c34e7a17c51a7a2c81..b7b16cb5ff0fe0880be38e5693f417975515986e 100644 (file)
@@ -1720,18 +1720,6 @@ void amdgpu_dpm_enable_uvd(struct amdgpu_device *adev, bool enable)
                mutex_lock(&adev->pm.mutex);
                amdgpu_dpm_set_powergating_by_smu(adev, AMD_IP_BLOCK_TYPE_UVD, !enable);
                mutex_unlock(&adev->pm.mutex);
-       } else {
-               if (enable) {
-                       mutex_lock(&adev->pm.mutex);
-                       adev->pm.dpm.uvd_active = true;
-                       adev->pm.dpm.state = POWER_STATE_TYPE_INTERNAL_UVD;
-                       mutex_unlock(&adev->pm.mutex);
-               } else {
-                       mutex_lock(&adev->pm.mutex);
-                       adev->pm.dpm.uvd_active = false;
-                       mutex_unlock(&adev->pm.mutex);
-               }
-               amdgpu_pm_compute_clocks(adev);
        }
 }
 
@@ -1742,29 +1730,6 @@ void amdgpu_dpm_enable_vce(struct amdgpu_device *adev, bool enable)
                mutex_lock(&adev->pm.mutex);
                amdgpu_dpm_set_powergating_by_smu(adev, AMD_IP_BLOCK_TYPE_VCE, !enable);
                mutex_unlock(&adev->pm.mutex);
-       } else {
-               if (enable) {
-                       mutex_lock(&adev->pm.mutex);
-                       adev->pm.dpm.vce_active = true;
-                       /* XXX select vce level based on ring/task */
-                       adev->pm.dpm.vce_level = AMD_VCE_LEVEL_AC_ALL;
-                       mutex_unlock(&adev->pm.mutex);
-                       amdgpu_device_ip_set_clockgating_state(adev, AMD_IP_BLOCK_TYPE_VCE,
-                                                              AMD_CG_STATE_UNGATE);
-                       amdgpu_device_ip_set_powergating_state(adev, AMD_IP_BLOCK_TYPE_VCE,
-                                                              AMD_PG_STATE_UNGATE);
-                       amdgpu_pm_compute_clocks(adev);
-               } else {
-                       amdgpu_device_ip_set_powergating_state(adev, AMD_IP_BLOCK_TYPE_VCE,
-                                                              AMD_PG_STATE_GATE);
-                       amdgpu_device_ip_set_clockgating_state(adev, AMD_IP_BLOCK_TYPE_VCE,
-                                                              AMD_CG_STATE_GATE);
-                       mutex_lock(&adev->pm.mutex);
-                       adev->pm.dpm.vce_active = false;
-                       mutex_unlock(&adev->pm.mutex);
-                       amdgpu_pm_compute_clocks(adev);
-               }
-
        }
 }