Commit 7b111aaa authored by Dr. David Alan Gilbert's avatar Dr. David Alan Gilbert Committed by Alex Deucher
Browse files

drm/amdgpu: Remove powerdown_uvd member 



With phm_powerdown_uvd() gone in the previous patch, there's
now no longer anything that reads the powerdown_uvd member of the
pp_hwmgr_func.

Remove it.

There are a few assignments to it; a boring NULL which can just go,
and two functions, but those functions are called explicitly anyway
so the assignments to the member go.

One of those (smu7_powerdown_uvd) wasn't static previously;
make it static.

Signed-off-by: default avatarDr. David Alan Gilbert <linux@treblig.org>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 51cd1bcf

drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c

+0 −1
Original line number Diff line number Diff line
@@ -1642,7 +1642,6 @@ static const struct pp_hwmgr_func smu10_hwmgr_funcs = { 
	.apply_state_adjust_rules = smu10_apply_state_adjust_rules,

	.force_dpm_level = smu10_dpm_force_dpm_level,

	.get_power_state_size = smu10_get_power_state_size,

	.powerdown_uvd = NULL,

	.powergate_uvd = smu10_powergate_vcn,

	.powergate_vce = NULL,

	.get_mclk = smu10_dpm_get_mclk,

drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_clockpowergating.c

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ static int smu7_update_vce_dpm(struct pp_hwmgr *hwmgr, bool bgate) 
	return smu7_enable_disable_vce_dpm(hwmgr, !bgate);

}



int smu7_powerdown_uvd(struct pp_hwmgr *hwmgr)

static int smu7_powerdown_uvd(struct pp_hwmgr *hwmgr)

{

	if (phm_cf_want_uvd_power_gating(hwmgr))

		return smum_send_msg_to_smc(hwmgr,

drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_clockpowergating.h

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 


void smu7_powergate_vce(struct pp_hwmgr *hwmgr, bool bgate);

void smu7_powergate_uvd(struct pp_hwmgr *hwmgr, bool bgate);

int smu7_powerdown_uvd(struct pp_hwmgr *hwmgr);

int smu7_powergate_acp(struct pp_hwmgr *hwmgr, bool bgate);

int smu7_disable_clock_power_gating(struct pp_hwmgr *hwmgr);

int smu7_update_clock_gatings(struct pp_hwmgr *hwmgr,

drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c

+0 −1
Original line number Diff line number Diff line
@@ -5754,7 +5754,6 @@ static const struct pp_hwmgr_func smu7_hwmgr_funcs = { 
	.patch_boot_state = smu7_dpm_patch_boot_state,

	.get_pp_table_entry = smu7_get_pp_table_entry,

	.get_num_of_pp_table_entries = smu7_get_number_of_powerplay_table_entries,

	.powerdown_uvd = smu7_powerdown_uvd,

	.powergate_uvd = smu7_powergate_uvd,

	.powergate_vce = smu7_powergate_vce,

	.disable_clock_power_gating = smu7_disable_clock_power_gating,

drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c

+0 −1
Original line number Diff line number Diff line
@@ -2044,7 +2044,6 @@ static const struct pp_hwmgr_func smu8_hwmgr_funcs = { 
	.apply_state_adjust_rules = smu8_apply_state_adjust_rules,

	.force_dpm_level = smu8_dpm_force_dpm_level,

	.get_power_state_size = smu8_get_power_state_size,

	.powerdown_uvd = smu8_dpm_powerdown_uvd,

	.powergate_uvd = smu8_dpm_powergate_uvd,

	.powergate_vce = smu8_dpm_powergate_vce,

	.powergate_acp = smu8_dpm_powergate_acp,