Merge tag 'mmc-v4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc

[cascardo/linux.git] / drivers / gpu / drm / amd / powerplay / smumgr / smumgr.c

diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c
index bbeb786..e5812aa 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c
@@ -86,6 +86,57 @@ int smum_fini(struct pp_smumgr *smumgr)
        return 0;
 }
 
+int smum_thermal_avfs_enable(struct pp_hwmgr *hwmgr,
+               void *input, void *output, void *storage, int result)
+{
+       if (NULL != hwmgr->smumgr->smumgr_funcs->thermal_avfs_enable)
+               return hwmgr->smumgr->smumgr_funcs->thermal_avfs_enable(hwmgr);
+
+       return 0;
+}
+
+int smum_thermal_setup_fan_table(struct pp_hwmgr *hwmgr,
+               void *input, void *output, void *storage, int result)
+{
+       if (NULL != hwmgr->smumgr->smumgr_funcs->thermal_setup_fan_table)
+               return hwmgr->smumgr->smumgr_funcs->thermal_setup_fan_table(hwmgr);
+
+       return 0;
+}
+
+int smum_update_sclk_threshold(struct pp_hwmgr *hwmgr)
+{
+
+       if (NULL != hwmgr->smumgr->smumgr_funcs->update_sclk_threshold)
+               return hwmgr->smumgr->smumgr_funcs->update_sclk_threshold(hwmgr);
+
+       return 0;
+}
+
+int smum_update_smc_table(struct pp_hwmgr *hwmgr, uint32_t type)
+{
+
+       if (NULL != hwmgr->smumgr->smumgr_funcs->update_smc_table)
+               return hwmgr->smumgr->smumgr_funcs->update_smc_table(hwmgr, type);
+
+       return 0;
+}
+
+uint32_t smum_get_offsetof(struct pp_smumgr *smumgr, uint32_t type, uint32_t member)
+{
+       if (NULL != smumgr->smumgr_funcs->get_offsetof)
+               return smumgr->smumgr_funcs->get_offsetof(type, member);
+
+       return 0;
+}
+
+int smum_process_firmware_header(struct pp_hwmgr *hwmgr)
+{
+       if (NULL != hwmgr->smumgr->smumgr_funcs->process_firmware_header)
+               return hwmgr->smumgr->smumgr_funcs->process_firmware_header(hwmgr);
+       return 0;
+}
+
 int smum_get_argument(struct pp_smumgr *smumgr)
 {
        if (NULL != smumgr->smumgr_funcs->get_argument)
@@ -94,13 +145,20 @@ int smum_get_argument(struct pp_smumgr *smumgr)
        return 0;
 }
 
+uint32_t smum_get_mac_definition(struct pp_smumgr *smumgr, uint32_t value)
+{
+       if (NULL != smumgr->smumgr_funcs->get_mac_definition)
+               return smumgr->smumgr_funcs->get_mac_definition(value);
+
+       return 0;
+}
+
 int smum_download_powerplay_table(struct pp_smumgr *smumgr,
                                                                void **table)
 {
        if (NULL != smumgr->smumgr_funcs->download_pptable_settings)
                return smumgr->smumgr_funcs->download_pptable_settings(smumgr,
                                                                        table);
-
        return 0;
 }
 
@@ -267,3 +325,44 @@ int smu_free_memory(void *device, void *handle)
 
        return 0;
 }
+
+int smum_init_smc_table(struct pp_hwmgr *hwmgr)
+{
+       if (NULL != hwmgr->smumgr->smumgr_funcs->init_smc_table)
+               return hwmgr->smumgr->smumgr_funcs->init_smc_table(hwmgr);
+
+       return 0;
+}
+
+int smum_populate_all_graphic_levels(struct pp_hwmgr *hwmgr)
+{
+       if (NULL != hwmgr->smumgr->smumgr_funcs->populate_all_graphic_levels)
+               return hwmgr->smumgr->smumgr_funcs->populate_all_graphic_levels(hwmgr);
+
+       return 0;
+}
+
+int smum_populate_all_memory_levels(struct pp_hwmgr *hwmgr)
+{
+       if (NULL != hwmgr->smumgr->smumgr_funcs->populate_all_memory_levels)
+               return hwmgr->smumgr->smumgr_funcs->populate_all_memory_levels(hwmgr);
+
+       return 0;
+}
+
+/*this interface is needed by island ci/vi */
+int smum_initialize_mc_reg_table(struct pp_hwmgr *hwmgr)
+{
+       if (NULL != hwmgr->smumgr->smumgr_funcs->initialize_mc_reg_table)
+               return hwmgr->smumgr->smumgr_funcs->initialize_mc_reg_table(hwmgr);
+
+       return 0;
+}
+
+bool smum_is_dpm_running(struct pp_hwmgr *hwmgr)
+{
+       if (NULL != hwmgr->smumgr->smumgr_funcs->is_dpm_running)
+               return hwmgr->smumgr->smumgr_funcs->is_dpm_running(hwmgr);
+
+       return true;
+}