tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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: Dr. David Alan Gilbert <linux@treblig.org>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Dr. David Alan Gilbert and committed by
Alex Deucher 7b111aaa 51cd1bcf

+1 -6
-1
drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c
··· 1642 1642 .apply_state_adjust_rules = smu10_apply_state_adjust_rules, 1643 1643 .force_dpm_level = smu10_dpm_force_dpm_level, 1644 1644 .get_power_state_size = smu10_get_power_state_size, 1645 - .powerdown_uvd = NULL, 1646 1645 .powergate_uvd = smu10_powergate_vcn, 1647 1646 .powergate_vce = NULL, 1648 1647 .get_mclk = smu10_dpm_get_mclk,
+1 -1
drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_clockpowergating.c
··· 55 55 return smu7_enable_disable_vce_dpm(hwmgr, !bgate); 56 56 } 57 57 58 - int smu7_powerdown_uvd(struct pp_hwmgr *hwmgr) 58 + static int smu7_powerdown_uvd(struct pp_hwmgr *hwmgr) 59 59 { 60 60 if (phm_cf_want_uvd_power_gating(hwmgr)) 61 61 return smum_send_msg_to_smc(hwmgr,
-1
drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_clockpowergating.h
··· 28 28 29 29 void smu7_powergate_vce(struct pp_hwmgr *hwmgr, bool bgate); 30 30 void smu7_powergate_uvd(struct pp_hwmgr *hwmgr, bool bgate); 31 - int smu7_powerdown_uvd(struct pp_hwmgr *hwmgr); 32 31 int smu7_powergate_acp(struct pp_hwmgr *hwmgr, bool bgate); 33 32 int smu7_disable_clock_power_gating(struct pp_hwmgr *hwmgr); 34 33 int smu7_update_clock_gatings(struct pp_hwmgr *hwmgr,
-1
drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c
··· 5754 5754 .patch_boot_state = smu7_dpm_patch_boot_state, 5755 5755 .get_pp_table_entry = smu7_get_pp_table_entry, 5756 5756 .get_num_of_pp_table_entries = smu7_get_number_of_powerplay_table_entries, 5757 - .powerdown_uvd = smu7_powerdown_uvd, 5758 5757 .powergate_uvd = smu7_powergate_uvd, 5759 5758 .powergate_vce = smu7_powergate_vce, 5760 5759 .disable_clock_power_gating = smu7_disable_clock_power_gating,
-1
drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c
··· 2044 2044 .apply_state_adjust_rules = smu8_apply_state_adjust_rules, 2045 2045 .force_dpm_level = smu8_dpm_force_dpm_level, 2046 2046 .get_power_state_size = smu8_get_power_state_size, 2047 - .powerdown_uvd = smu8_dpm_powerdown_uvd, 2048 2047 .powergate_uvd = smu8_dpm_powergate_uvd, 2049 2048 .powergate_vce = smu8_dpm_powergate_vce, 2050 2049 .powergate_acp = smu8_dpm_powergate_acp,
-1
drivers/gpu/drm/amd/pm/powerplay/inc/hwmgr.h
··· 257 257 int (*get_pp_table_entry)(struct pp_hwmgr *hwmgr, 258 258 unsigned long, struct pp_power_state *); 259 259 int (*get_num_of_pp_table_entries)(struct pp_hwmgr *hwmgr); 260 - int (*powerdown_uvd)(struct pp_hwmgr *hwmgr); 261 260 void (*powergate_vce)(struct pp_hwmgr *hwmgr, bool bgate); 262 261 void (*powergate_uvd)(struct pp_hwmgr *hwmgr, bool bgate); 263 262 void (*powergate_acp)(struct pp_hwmgr *hwmgr, bool bgate);