drm/amd/powerplay: delete dead code in powerplay.

Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
index 4ad84530c88aa01b8ba2072c0ea232ea247eabb1..b3d42858f68b6f75bfc33ac1c9e7635b43b0a64c 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
@@ -4522,32 +4522,6 @@ static int smu7_get_clock_by_type(struct pp_hwmgr *hwmgr, enum amd_pp_clock_type
        return 0;
 }
 
-static int smu7_request_firmware(struct pp_hwmgr *hwmgr)
-{
-       int ret;
-       struct cgs_firmware_info info = {0};
-
-       ret = cgs_get_firmware_info(hwmgr->device,
-                                   smu7_convert_fw_type_to_cgs(UCODE_ID_SMU),
-                                   &info);
-       if (ret || !info.kptr)
-               return -EINVAL;
-
-       return 0;
-}
-
-static int smu7_release_firmware(struct pp_hwmgr *hwmgr)
-{
-       int ret;
-
-       ret = cgs_rel_firmware(hwmgr->device,
-                              smu7_convert_fw_type_to_cgs(UCODE_ID_SMU));
-       if (ret)
-               return -EINVAL;
-
-       return 0;
-}
-
 static void smu7_find_min_clock_masks(struct pp_hwmgr *hwmgr,
                uint32_t *sclk_mask, uint32_t *mclk_mask,
                uint32_t min_sclk, uint32_t min_mclk)
@@ -4691,8 +4665,6 @@ static const struct pp_hwmgr_func smu7_hwmgr_funcs = {
        .get_clock_by_type = smu7_get_clock_by_type,
        .read_sensor = smu7_read_sensor,
        .dynamic_state_management_disable = smu7_disable_dpm_tasks,
-       .request_firmware = smu7_request_firmware,
-       .release_firmware = smu7_release_firmware,
        .set_power_profile_state = smu7_set_power_profile_state,
        .avfs_control = smu7_avfs_control,
        .disable_smc_firmware_ctf = smu7_thermal_disable_alert,

diff --git a/drivers/gpu/drm/amd/powerplay/inc/hwmgr.h b/drivers/gpu/drm/amd/powerplay/inc/hwmgr.h
index 98d38c31f6a645761ebe20d614023393b001f5d8..e4574c215c38ec41ede1b28c42306a845b9e4713 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/inc/hwmgr.h
+++ b/drivers/gpu/drm/amd/powerplay/inc/hwmgr.h
@@ -368,8 +368,6 @@ struct pp_hwmgr_func {
        int (*get_mclk_od)(struct pp_hwmgr *hwmgr);
        int (*set_mclk_od)(struct pp_hwmgr *hwmgr, uint32_t value);
        int (*read_sensor)(struct pp_hwmgr *hwmgr, int idx, void *value, int *size);
-       int (*request_firmware)(struct pp_hwmgr *hwmgr);
-       int (*release_firmware)(struct pp_hwmgr *hwmgr);
        int (*set_power_profile_state)(struct pp_hwmgr *hwmgr,
                        struct amd_pp_profile *request);
        int (*avfs_control)(struct pp_hwmgr *hwmgr, bool enable);