Commit 9d45ad5a authored by Alex Deucher's avatar Alex Deucher

drm/radeon/dpm: remove local sumo_get_xclk()

Use the new asic callback instead.
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent a5b91af2
...@@ -84,11 +84,6 @@ struct sumo_power_info *sumo_get_pi(struct radeon_device *rdev) ...@@ -84,11 +84,6 @@ struct sumo_power_info *sumo_get_pi(struct radeon_device *rdev)
return pi; return pi;
} }
u32 sumo_get_xclk(struct radeon_device *rdev)
{
return rdev->clock.spll.reference_freq;
}
static void sumo_gfx_clockgating_enable(struct radeon_device *rdev, bool enable) static void sumo_gfx_clockgating_enable(struct radeon_device *rdev, bool enable)
{ {
if (enable) if (enable)
...@@ -124,7 +119,7 @@ static void sumo_mg_clockgating_enable(struct radeon_device *rdev, bool enable) ...@@ -124,7 +119,7 @@ static void sumo_mg_clockgating_enable(struct radeon_device *rdev, bool enable)
static void sumo_program_git(struct radeon_device *rdev) static void sumo_program_git(struct radeon_device *rdev)
{ {
u32 p, u; u32 p, u;
u32 xclk = sumo_get_xclk(rdev); u32 xclk = radeon_get_xclk(rdev);
r600_calculate_u_and_p(SUMO_GICST_DFLT, r600_calculate_u_and_p(SUMO_GICST_DFLT,
xclk, 16, &p, &u); xclk, 16, &p, &u);
...@@ -135,7 +130,7 @@ static void sumo_program_git(struct radeon_device *rdev) ...@@ -135,7 +130,7 @@ static void sumo_program_git(struct radeon_device *rdev)
static void sumo_program_grsd(struct radeon_device *rdev) static void sumo_program_grsd(struct radeon_device *rdev)
{ {
u32 p, u; u32 p, u;
u32 xclk = sumo_get_xclk(rdev); u32 xclk = radeon_get_xclk(rdev);
u32 grs = 256 * 25 / 100; u32 grs = 256 * 25 / 100;
r600_calculate_u_and_p(1, xclk, 14, &p, &u); r600_calculate_u_and_p(1, xclk, 14, &p, &u);
...@@ -155,7 +150,7 @@ static void sumo_gfx_powergating_initialize(struct radeon_device *rdev) ...@@ -155,7 +150,7 @@ static void sumo_gfx_powergating_initialize(struct radeon_device *rdev)
u32 p, u; u32 p, u;
u32 p_c, p_p, d_p; u32 p_c, p_p, d_p;
u32 r_t, i_t; u32 r_t, i_t;
u32 xclk = sumo_get_xclk(rdev); u32 xclk = radeon_get_xclk(rdev);
if (rdev->family == CHIP_PALM) { if (rdev->family == CHIP_PALM) {
p_c = 4; p_c = 4;
...@@ -319,7 +314,7 @@ static void sumo_calculate_bsp(struct radeon_device *rdev, ...@@ -319,7 +314,7 @@ static void sumo_calculate_bsp(struct radeon_device *rdev,
u32 high_clk) u32 high_clk)
{ {
struct sumo_power_info *pi = sumo_get_pi(rdev); struct sumo_power_info *pi = sumo_get_pi(rdev);
u32 xclk = sumo_get_xclk(rdev); u32 xclk = radeon_get_xclk(rdev);
pi->pasi = 65535 * 100 / high_clk; pi->pasi = 65535 * 100 / high_clk;
pi->asi = 65535 * 100 / high_clk; pi->asi = 65535 * 100 / high_clk;
...@@ -466,7 +461,7 @@ void sumo_clear_vc(struct radeon_device *rdev) ...@@ -466,7 +461,7 @@ void sumo_clear_vc(struct radeon_device *rdev)
void sumo_program_sstp(struct radeon_device *rdev) void sumo_program_sstp(struct radeon_device *rdev)
{ {
u32 p, u; u32 p, u;
u32 xclk = sumo_get_xclk(rdev); u32 xclk = radeon_get_xclk(rdev);
r600_calculate_u_and_p(SUMO_SST_DFLT, r600_calculate_u_and_p(SUMO_SST_DFLT,
xclk, 16, &p, &u); xclk, 16, &p, &u);
...@@ -909,7 +904,7 @@ static void sumo_start_am(struct radeon_device *rdev) ...@@ -909,7 +904,7 @@ static void sumo_start_am(struct radeon_device *rdev)
static void sumo_program_ttp(struct radeon_device *rdev) static void sumo_program_ttp(struct radeon_device *rdev)
{ {
u32 xclk = sumo_get_xclk(rdev); u32 xclk = radeon_get_xclk(rdev);
u32 p, u; u32 p, u;
u32 cg_sclk_dpm_ctrl_5 = RREG32(CG_SCLK_DPM_CTRL_5); u32 cg_sclk_dpm_ctrl_5 = RREG32(CG_SCLK_DPM_CTRL_5);
...@@ -955,7 +950,7 @@ static void sumo_program_dc_hto(struct radeon_device *rdev) ...@@ -955,7 +950,7 @@ static void sumo_program_dc_hto(struct radeon_device *rdev)
{ {
u32 cg_sclk_dpm_ctrl_4 = RREG32(CG_SCLK_DPM_CTRL_4); u32 cg_sclk_dpm_ctrl_4 = RREG32(CG_SCLK_DPM_CTRL_4);
u32 p, u; u32 p, u;
u32 xclk = sumo_get_xclk(rdev); u32 xclk = radeon_get_xclk(rdev);
r600_calculate_u_and_p(100000, r600_calculate_u_and_p(100000,
xclk, 14, &p, &u); xclk, 14, &p, &u);
......
...@@ -188,7 +188,6 @@ struct sumo_power_info { ...@@ -188,7 +188,6 @@ struct sumo_power_info {
#define SUMO_GFXPOWERGATINGT_DFLT 100 #define SUMO_GFXPOWERGATINGT_DFLT 100
/* sumo_dpm.c */ /* sumo_dpm.c */
u32 sumo_get_xclk(struct radeon_device *rdev);
void sumo_gfx_clockgating_initialize(struct radeon_device *rdev); void sumo_gfx_clockgating_initialize(struct radeon_device *rdev);
void sumo_program_vc(struct radeon_device *rdev, u32 vrc); void sumo_program_vc(struct radeon_device *rdev, u32 vrc);
void sumo_clear_vc(struct radeon_device *rdev); void sumo_clear_vc(struct radeon_device *rdev);
......
...@@ -146,7 +146,7 @@ void sumo_enable_boost_timer(struct radeon_device *rdev) ...@@ -146,7 +146,7 @@ void sumo_enable_boost_timer(struct radeon_device *rdev)
{ {
struct sumo_power_info *pi = sumo_get_pi(rdev); struct sumo_power_info *pi = sumo_get_pi(rdev);
u32 period, unit, timer_value; u32 period, unit, timer_value;
u32 xclk = sumo_get_xclk(rdev); u32 xclk = radeon_get_xclk(rdev);
unit = (RREG32_RCU(RCU_LCLK_SCALING_CNTL) & LCLK_SCALING_TIMER_PRESCALER_MASK) unit = (RREG32_RCU(RCU_LCLK_SCALING_CNTL) & LCLK_SCALING_TIMER_PRESCALER_MASK)
>> LCLK_SCALING_TIMER_PRESCALER_SHIFT; >> LCLK_SCALING_TIMER_PRESCALER_SHIFT;
......
...@@ -361,7 +361,7 @@ static void trinity_gfx_powergating_initialize(struct radeon_device *rdev) ...@@ -361,7 +361,7 @@ static void trinity_gfx_powergating_initialize(struct radeon_device *rdev)
u32 p, u; u32 p, u;
u32 value; u32 value;
struct atom_clock_dividers dividers; struct atom_clock_dividers dividers;
u32 xclk = sumo_get_xclk(rdev); u32 xclk = radeon_get_xclk(rdev);
u32 sssd = 1; u32 sssd = 1;
int ret; int ret;
u32 hw_rev = (RREG32(HW_REV) & ATI_REV_ID_MASK) >> ATI_REV_ID_SHIFT; u32 hw_rev = (RREG32(HW_REV) & ATI_REV_ID_MASK) >> ATI_REV_ID_SHIFT;
...@@ -880,7 +880,7 @@ static void trinity_setup_uvd_dpm_interval(struct radeon_device *rdev, ...@@ -880,7 +880,7 @@ static void trinity_setup_uvd_dpm_interval(struct radeon_device *rdev,
u32 p, u; u32 p, u;
u32 tp = RREG32_SMC(PM_TP); u32 tp = RREG32_SMC(PM_TP);
u32 val; u32 val;
u32 xclk = sumo_get_xclk(rdev); u32 xclk = radeon_get_xclk(rdev);
r600_calculate_u_and_p(interval, xclk, 16, &p, &u); r600_calculate_u_and_p(interval, xclk, 16, &p, &u);
...@@ -1000,7 +1000,7 @@ static void trinity_program_sclk_dpm(struct radeon_device *rdev) ...@@ -1000,7 +1000,7 @@ static void trinity_program_sclk_dpm(struct radeon_device *rdev)
u32 p, u; u32 p, u;
u32 tp = RREG32_SMC(PM_TP); u32 tp = RREG32_SMC(PM_TP);
u32 ni; u32 ni;
u32 xclk = sumo_get_xclk(rdev); u32 xclk = radeon_get_xclk(rdev);
u32 value; u32 value;
r600_calculate_u_and_p(400, xclk, 16, &p, &u); r600_calculate_u_and_p(400, xclk, 16, &p, &u);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment