evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drm/radeon/si: drop cg_update from dpm code

Browse source 
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>
This commit is contained in:
Alex Deucher 2013-12-18 14:11:40 -05:00
parent bb5abf9f64
commit 68e3a092c1
2 changed files with 2 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/gpu/drm/radeon/si.c
View file

@ -5210,8 +5210,8 @@ static void si_enable_hdp_ls(struct radeon_device *rdev,
WREG32(HDP_MEM_POWER_LS, data); WREG32(HDP_MEM_POWER_LS, data);
} }
void si_update_cg(struct radeon_device *rdev, static void si_update_cg(struct radeon_device *rdev,
u32 block, bool enable) u32 block, bool enable)
{ {
if (block & RADEON_CG_BLOCK_GFX) { if (block & RADEON_CG_BLOCK_GFX) {
si_enable_gui_idle_interrupt(rdev, false); si_enable_gui_idle_interrupt(rdev, false);

38
drivers/gpu/drm/radeon/si_dpm.c
View file

@ -1753,9 +1753,6 @@ static int si_calculate_sclk_params(struct radeon_device *rdev,
u32 engine_clock, u32 engine_clock,
SISLANDS_SMC_SCLK_VALUE *sclk); SISLANDS_SMC_SCLK_VALUE *sclk);
extern void si_update_cg(struct radeon_device *rdev,
u32 block, bool enable);
static struct si_power_info *si_get_pi(struct radeon_device *rdev) static struct si_power_info *si_get_pi(struct radeon_device *rdev)
{ {
struct si_power_info *pi = rdev->pm.dpm.priv; struct si_power_info *pi = rdev->pm.dpm.priv;
@ -5791,13 +5788,6 @@ int si_dpm_enable(struct radeon_device *rdev)
struct radeon_ps *boot_ps = rdev->pm.dpm.boot_ps; struct radeon_ps *boot_ps = rdev->pm.dpm.boot_ps;
int ret; int ret;
si_update_cg(rdev, (RADEON_CG_BLOCK_GFX |
RADEON_CG_BLOCK_MC |
RADEON_CG_BLOCK_SDMA |
RADEON_CG_BLOCK_BIF |
RADEON_CG_BLOCK_UVD |
RADEON_CG_BLOCK_HDP), false);
if (si_is_smc_running(rdev)) if (si_is_smc_running(rdev))
return -EINVAL; return -EINVAL;
if (pi->voltage_control) if (pi->voltage_control)
@ -5917,13 +5907,6 @@ int si_dpm_enable(struct radeon_device *rdev)
si_enable_auto_throttle_source(rdev, RADEON_DPM_AUTO_THROTTLE_SRC_THERMAL, true); si_enable_auto_throttle_source(rdev, RADEON_DPM_AUTO_THROTTLE_SRC_THERMAL, true);
si_update_cg(rdev, (RADEON_CG_BLOCK_GFX |
RADEON_CG_BLOCK_MC |
RADEON_CG_BLOCK_SDMA |
RADEON_CG_BLOCK_BIF |
RADEON_CG_BLOCK_UVD |
RADEON_CG_BLOCK_HDP), true);
ni_update_current_ps(rdev, boot_ps); ni_update_current_ps(rdev, boot_ps);
return 0; return 0;
@ -5934,13 +5917,6 @@ void si_dpm_disable(struct radeon_device *rdev)
struct rv7xx_power_info *pi = rv770_get_pi(rdev); struct rv7xx_power_info *pi = rv770_get_pi(rdev);
struct radeon_ps *boot_ps = rdev->pm.dpm.boot_ps; struct radeon_ps *boot_ps = rdev->pm.dpm.boot_ps;
si_update_cg(rdev, (RADEON_CG_BLOCK_GFX |
RADEON_CG_BLOCK_MC |
RADEON_CG_BLOCK_SDMA |
RADEON_CG_BLOCK_BIF |
RADEON_CG_BLOCK_UVD |
RADEON_CG_BLOCK_HDP), false);
if (!si_is_smc_running(rdev)) if (!si_is_smc_running(rdev))
return; return;
si_disable_ulv(rdev); si_disable_ulv(rdev);
@ -6005,13 +5981,6 @@ int si_dpm_set_power_state(struct radeon_device *rdev)
struct radeon_ps *old_ps = &eg_pi->current_rps; struct radeon_ps *old_ps = &eg_pi->current_rps;
int ret; int ret;
si_update_cg(rdev, (RADEON_CG_BLOCK_GFX |
RADEON_CG_BLOCK_MC |
RADEON_CG_BLOCK_SDMA |
RADEON_CG_BLOCK_BIF |
RADEON_CG_BLOCK_UVD |
RADEON_CG_BLOCK_HDP), false);
ret = si_disable_ulv(rdev); ret = si_disable_ulv(rdev);
if (ret) { if (ret) {
DRM_ERROR("si_disable_ulv failed\n"); DRM_ERROR("si_disable_ulv failed\n");
@ -6104,13 +6073,6 @@ int si_dpm_set_power_state(struct radeon_device *rdev)
return ret; return ret;
} }
si_update_cg(rdev, (RADEON_CG_BLOCK_GFX |
RADEON_CG_BLOCK_MC |
RADEON_CG_BLOCK_SDMA |
RADEON_CG_BLOCK_BIF |
RADEON_CG_BLOCK_UVD |
RADEON_CG_BLOCK_HDP), true);
return 0; return 0;
} }