From e07f6a55d37143b6034f028de9c9ac267c2e90ae Mon Sep 17 00:00:00 2001 From: Rex Zhu Date: Fri, 29 Sep 2017 18:00:24 +0800 Subject: [PATCH 1935/4131] Revert "drm/amd/powerplay: export new smu interface to hwmgr" This reverts commit 985d1798f6612756eb415cbe13da672276e61e8a. --- drivers/gpu/drm/amd/powerplay/inc/smumgr.h | 4 ---- drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 25 ------------------------- 2 files changed, 29 deletions(-) diff --git a/drivers/gpu/drm/amd/powerplay/inc/smumgr.h b/drivers/gpu/drm/amd/powerplay/inc/smumgr.h index a04cd53..7c9aba8 100644 --- a/drivers/gpu/drm/amd/powerplay/inc/smumgr.h +++ b/drivers/gpu/drm/amd/powerplay/inc/smumgr.h @@ -129,9 +129,5 @@ extern int smum_populate_requested_graphic_levels(struct pp_hwmgr *hwmgr, extern bool smum_is_hw_avfs_present(struct pp_hwmgr *hwmgr); -extern bool smum_smu_init(struct pp_hwmgr *hwmgr); -extern bool smum_smu_fini(struct pp_hwmgr *hwmgr); - -extern bool smum_start_smu(struct pp_hwmgr *hwmgr); #endif diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c index f08c309..8673884 100644 --- a/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c +++ b/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c @@ -253,28 +253,3 @@ bool smum_is_hw_avfs_present(struct pp_hwmgr *hwmgr) return false; } - - -bool smum_smu_init(struct pp_hwmgr *hwmgr) -{ - if (hwmgr->smumgr_funcs->smu_init) - return hwmgr->smumgr_funcs->smu_init(hwmgr); - - return false; -} - -bool smum_smu_fini(struct pp_hwmgr *hwmgr) -{ - if (hwmgr->smumgr_funcs->smu_fini) - return hwmgr->smumgr_funcs->smu_fini(hwmgr); - - return false; -} - -bool smum_start_smu(struct pp_hwmgr *hwmgr) -{ - if (hwmgr->smumgr_funcs->start_smu) - return hwmgr->smumgr_funcs->start_smu(hwmgr); - - return false; -} -- 2.7.4