drm/amdgpu: remove old CI DPM implementation

The power smu7 powerplay code is much more robust and has
been the default for a while now.  Remove the old code.

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

1 files changed, 2 insertions, 8 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/cik.c b/drivers/gpu/drm/amd/amdgpu/cik.c
index b1b7abed7dab..07c1f239e9c3 100644
--- a/drivers/gpu/drm/amd/amdgpu/cik.c
+++ b/drivers/gpu/drm/amd/amdgpu/cik.c
@@ -2070,10 +2070,7 @@ int cik_set_ip_blocks(struct amdgpu_device *adev)
                 amdgpu_device_ip_block_add(adev, &cik_ih_ip_block);
                 amdgpu_device_ip_block_add(adev, &gfx_v7_2_ip_block);
                 amdgpu_device_ip_block_add(adev, &cik_sdma_ip_block);
-                if (amdgpu_dpm == -1)
-                        amdgpu_device_ip_block_add(adev, &pp_smu_ip_block);
-                else
-                        amdgpu_device_ip_block_add(adev, &ci_smu_ip_block);
+                amdgpu_device_ip_block_add(adev, &pp_smu_ip_block);
                 if (adev->enable_virtual_display)
                         amdgpu_device_ip_block_add(adev, &dce_virtual_ip_block);
 #if defined(CONFIG_DRM_AMD_DC)
@@ -2091,10 +2088,7 @@ int cik_set_ip_blocks(struct amdgpu_device *adev)
                 amdgpu_device_ip_block_add(adev, &cik_ih_ip_block);
                 amdgpu_device_ip_block_add(adev, &gfx_v7_3_ip_block);
                 amdgpu_device_ip_block_add(adev, &cik_sdma_ip_block);
-                if (amdgpu_dpm == -1)
-                        amdgpu_device_ip_block_add(adev, &pp_smu_ip_block);
-                else
-                        amdgpu_device_ip_block_add(adev, &ci_smu_ip_block);
+                amdgpu_device_ip_block_add(adev, &pp_smu_ip_block);
                 if (adev->enable_virtual_display)
                         amdgpu_device_ip_block_add(adev, &dce_virtual_ip_block);
 #if defined(CONFIG_DRM_AMD_DC)