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>

diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c
index a8c732e0700699fa8dea1ea1d962daa4ff33b89d..9a821563bc8e901c48e0edd1fa6c8feec55a0102 100644 (file)
--- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c
+++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c
@@ -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,

diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_clockpowergating.c b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_clockpowergating.c
index f2bda3bcbbde23b1b5963b8f7e3a45b160070122..5e4c80f7b20a692917c8a25c68c68bbae4e276e0 100644 (file)
--- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_clockpowergating.c
+++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_clockpowergating.c
@@ -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,

diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_clockpowergating.h b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_clockpowergating.h
index fc8f8a6acc7223d7bb6b812e5e74e91e35dd430d..e56abbadc78bec267c7e031ee22b7eb6c2fa2ec6 100644 (file)
--- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_clockpowergating.h
+++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_clockpowergating.h
@@ -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,

diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c
index 632a25957477ee45151f7b51977af387d7719439..8da882c518565f079c16a9ef5dabad3e12c1d24e 100644 (file)
--- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c
+++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c
@@ -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,

diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c
index 7e11974208732547ac7e0030a15c3a680370cce3..9d3b33446adc9e53890fd83c43b0233d526a0cfc 100644 (file)
--- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c
+++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c
@@ -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,

diff --git a/drivers/gpu/drm/amd/pm/powerplay/inc/hwmgr.h b/drivers/gpu/drm/amd/pm/powerplay/inc/hwmgr.h
index 227bf0e84a130bbe67edf27369f7b1a5575926a9..c661185753b428041b192680c35b255836eb14ed 100644 (file)
--- a/drivers/gpu/drm/amd/pm/powerplay/inc/hwmgr.h
+++ b/drivers/gpu/drm/amd/pm/powerplay/inc/hwmgr.h
@@ -257,7 +257,6 @@ struct pp_hwmgr_func {
        int (*get_pp_table_entry)(struct pp_hwmgr *hwmgr,
                            unsigned long, struct pp_power_state *);
        int (*get_num_of_pp_table_entries)(struct pp_hwmgr *hwmgr);
-       int (*powerdown_uvd)(struct pp_hwmgr *hwmgr);
        void (*powergate_vce)(struct pp_hwmgr *hwmgr, bool bgate);
        void (*powergate_uvd)(struct pp_hwmgr *hwmgr, bool bgate);
        void (*powergate_acp)(struct pp_hwmgr *hwmgr, bool bgate);