Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e112b4a authored by Rex Zhu's avatar Rex Zhu Committed by Alex Deucher
Browse files

drm/amd/pp: remove fiji_smc/smumgr split. 



make all functions in fiji_smumgr.c static and
exported by pp_smumgr_func table.

Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarRex Zhu <Rex.Zhu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 9c4cd84f

drivers/gpu/drm/amd/powerplay/smumgr/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -2,7 +2,7 @@ 
# Makefile for the 'smu manager' sub-component of powerplay.

# Makefile for the 'smu manager' sub-component of powerplay.

# It provides the smu management services for the driver.

# It provides the smu management services for the driver.





SMU_MGR = smumgr.o cz_smumgr.o tonga_smumgr.o fiji_smumgr.o fiji_smc.o \

SMU_MGR = smumgr.o cz_smumgr.o tonga_smumgr.o fiji_smumgr.o \

	  polaris10_smumgr.o iceland_smumgr.o polaris10_smc.o tonga_smc.o \

	  polaris10_smumgr.o iceland_smumgr.o polaris10_smc.o tonga_smc.o \

	  smu7_smumgr.o iceland_smc.o vega10_smumgr.o rv_smumgr.o ci_smumgr.o

	  smu7_smumgr.o iceland_smc.o vega10_smumgr.o rv_smumgr.o ci_smumgr.o

drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c

deleted100644 → 0
+0 −2496

File deleted.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.h

deleted100644 → 0
+0 −53
Original line number Original line Diff line number Diff line 
/*

 * Copyright 2015 Advanced Micro Devices, Inc.

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the "Software"),

 * to deal in the Software without restriction, including without limitation

 * the rights to use, copy, modify, merge, publish, distribute, sublicense,

 * and/or sell copies of the Software, and to permit persons to whom the

 * Software is furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

 * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 * OTHER DEALINGS IN THE SOFTWARE.

 *

 */

#ifndef FIJI_SMC_H

#define FIJI_SMC_H



#include "smumgr.h"

#include "smu73.h"



struct fiji_pt_defaults {

	uint8_t   SviLoadLineEn;

	uint8_t   SviLoadLineVddC;

	uint8_t   TDC_VDDC_ThrottleReleaseLimitPerc;

	uint8_t   TDC_MAWt;

	uint8_t   TdcWaterfallCtl;

	uint8_t   DTEAmbientTempBase;

};



int fiji_populate_all_graphic_levels(struct pp_hwmgr *hwmgr);

int fiji_populate_all_memory_levels(struct pp_hwmgr *hwmgr);

int fiji_init_smc_table(struct pp_hwmgr *hwmgr);

int fiji_thermal_setup_fan_table(struct pp_hwmgr *hwmgr);

int fiji_update_smc_table(struct pp_hwmgr *hwmgr, uint32_t type);

int fiji_update_sclk_threshold(struct pp_hwmgr *hwmgr);

uint32_t fiji_get_offsetof(uint32_t type, uint32_t member);

uint32_t fiji_get_mac_definition(uint32_t value);

int fiji_process_firmware_header(struct pp_hwmgr *hwmgr);

int fiji_initialize_mc_reg_table(struct pp_hwmgr *hwmgr);

bool fiji_is_dpm_running(struct pp_hwmgr *hwmgr);

int fiji_populate_requested_graphic_levels(struct pp_hwmgr *hwmgr,

		struct amd_pp_profile *request);

int fiji_thermal_avfs_enable(struct pp_hwmgr *hwmgr);

#endif

drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c

+2371 −8

File changed.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.h

+9 −0
Original line number Original line Diff line number Diff line
@@ -28,6 +28,15 @@ 
#include "smu7_smumgr.h"

#include "smu7_smumgr.h"









struct fiji_pt_defaults {

	uint8_t   SviLoadLineEn;

	uint8_t   SviLoadLineVddC;

	uint8_t   TDC_VDDC_ThrottleReleaseLimitPerc;

	uint8_t   TDC_MAWt;

	uint8_t   TdcWaterfallCtl;

	uint8_t   DTEAmbientTempBase;

};



struct fiji_smumgr {

struct fiji_smumgr {

	struct smu7_smumgr                   smu7_data;

	struct smu7_smumgr                   smu7_data;

	struct SMU73_Discrete_DpmTable       smc_state_table;

	struct SMU73_Discrete_DpmTable       smc_state_table;