aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/kv_dpm.c
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2013-12-18 14:16:50 -0500
committerAlex Deucher <alexander.deucher@amd.com>2013-12-24 17:54:25 -0500
commitf2185ecef1ef49b00829561dad12cbdc5b23e6b3 (patch)
tree68895cd306114804bd0452cec552ff9ea2c492a5 /drivers/gpu/drm/radeon/kv_dpm.c
parent68e3a092c152443515c9ea2b0d008b80521efb4d (diff)
drm/radeon/cik: drop cg_update from dpm code
I'm not entirely sure this is required and it won't work with the dpm restructing anyway. Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/kv_dpm.c')
-rw-r--r--drivers/gpu/drm/radeon/kv_dpm.c25
1 files changed, 0 insertions, 25 deletions
diff --git a/drivers/gpu/drm/radeon/kv_dpm.c b/drivers/gpu/drm/radeon/kv_dpm.c
index b41905573cd2..a0e20eb963db 100644
--- a/drivers/gpu/drm/radeon/kv_dpm.c
+++ b/drivers/gpu/drm/radeon/kv_dpm.c
@@ -1126,11 +1126,6 @@ int kv_dpm_enable(struct radeon_device *rdev)
1126 struct kv_power_info *pi = kv_get_pi(rdev); 1126 struct kv_power_info *pi = kv_get_pi(rdev);
1127 int ret; 1127 int ret;
1128 1128
1129 cik_update_cg(rdev, (RADEON_CG_BLOCK_GFX |
1130 RADEON_CG_BLOCK_SDMA |
1131 RADEON_CG_BLOCK_BIF |
1132 RADEON_CG_BLOCK_HDP), false);
1133
1134 ret = kv_process_firmware_header(rdev); 1129 ret = kv_process_firmware_header(rdev);
1135 if (ret) { 1130 if (ret) {
1136 DRM_ERROR("kv_process_firmware_header failed\n"); 1131 DRM_ERROR("kv_process_firmware_header failed\n");
@@ -1238,11 +1233,6 @@ int kv_dpm_enable(struct radeon_device *rdev)
1238 kv_dpm_powergate_vce(rdev, true); 1233 kv_dpm_powergate_vce(rdev, true);
1239 kv_dpm_powergate_uvd(rdev, true); 1234 kv_dpm_powergate_uvd(rdev, true);
1240 1235
1241 cik_update_cg(rdev, (RADEON_CG_BLOCK_GFX |
1242 RADEON_CG_BLOCK_SDMA |
1243 RADEON_CG_BLOCK_BIF |
1244 RADEON_CG_BLOCK_HDP), true);
1245
1246 kv_update_current_ps(rdev, rdev->pm.dpm.boot_ps); 1236 kv_update_current_ps(rdev, rdev->pm.dpm.boot_ps);
1247 1237
1248 return ret; 1238 return ret;
@@ -1250,11 +1240,6 @@ int kv_dpm_enable(struct radeon_device *rdev)
1250 1240
1251void kv_dpm_disable(struct radeon_device *rdev) 1241void kv_dpm_disable(struct radeon_device *rdev)
1252{ 1242{
1253 cik_update_cg(rdev, (RADEON_CG_BLOCK_GFX |
1254 RADEON_CG_BLOCK_SDMA |
1255 RADEON_CG_BLOCK_BIF |
1256 RADEON_CG_BLOCK_HDP), false);
1257
1258 kv_smc_bapm_enable(rdev, false); 1243 kv_smc_bapm_enable(rdev, false);
1259 1244
1260 /* powerup blocks */ 1245 /* powerup blocks */
@@ -1779,11 +1764,6 @@ int kv_dpm_set_power_state(struct radeon_device *rdev)
1779 /*struct radeon_ps *old_ps = &pi->current_rps;*/ 1764 /*struct radeon_ps *old_ps = &pi->current_rps;*/
1780 int ret; 1765 int ret;
1781 1766
1782 cik_update_cg(rdev, (RADEON_CG_BLOCK_GFX |
1783 RADEON_CG_BLOCK_SDMA |
1784 RADEON_CG_BLOCK_BIF |
1785 RADEON_CG_BLOCK_HDP), false);
1786
1787 if (pi->bapm_enable) { 1767 if (pi->bapm_enable) {
1788 ret = kv_smc_bapm_enable(rdev, rdev->pm.dpm.ac_power); 1768 ret = kv_smc_bapm_enable(rdev, rdev->pm.dpm.ac_power);
1789 if (ret) { 1769 if (ret) {
@@ -1849,11 +1829,6 @@ int kv_dpm_set_power_state(struct radeon_device *rdev)
1849 } 1829 }
1850 } 1830 }
1851 1831
1852 cik_update_cg(rdev, (RADEON_CG_BLOCK_GFX |
1853 RADEON_CG_BLOCK_SDMA |
1854 RADEON_CG_BLOCK_BIF |
1855 RADEON_CG_BLOCK_HDP), true);
1856
1857 return 0; 1832 return 0;
1858} 1833}
1859 1834