drm/amd/pp: remove tonga_smc/smumgr split.
move functions in tonga_smc.c to tonga_smumgr.c and make all functions in tonga_smumgr.c static. Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Rex Zhu <Rex.Zhu@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
parent
907bfec7cc
commit
4dddc212a3
|
@ -3,7 +3,7 @@
|
||||||
# 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 \
|
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 \
|
||||||
smu7_smumgr.o vega10_smumgr.o rv_smumgr.o ci_smumgr.o
|
smu7_smumgr.o vega10_smumgr.o rv_smumgr.o ci_smumgr.o
|
||||||
|
|
||||||
AMD_PP_SMUMGR = $(addprefix $(AMD_PP_PATH)/smumgr/,$(SMU_MGR))
|
AMD_PP_SMUMGR = $(addprefix $(AMD_PP_PATH)/smumgr/,$(SMU_MGR))
|
||||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -1,62 +0,0 @@
|
||||||
/*
|
|
||||||
* 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 _TONGA_SMC_H
|
|
||||||
#define _TONGA_SMC_H
|
|
||||||
|
|
||||||
#include "smumgr.h"
|
|
||||||
#include "smu72.h"
|
|
||||||
|
|
||||||
|
|
||||||
#define ASICID_IS_TONGA_P(wDID, bRID) \
|
|
||||||
(((wDID == 0x6930) && ((bRID == 0xF0) || (bRID == 0xF1) || (bRID == 0xFF))) \
|
|
||||||
|| ((wDID == 0x6920) && ((bRID == 0) || (bRID == 1))))
|
|
||||||
|
|
||||||
|
|
||||||
struct tonga_pt_defaults {
|
|
||||||
uint8_t svi_load_line_en;
|
|
||||||
uint8_t svi_load_line_vddC;
|
|
||||||
uint8_t tdc_vddc_throttle_release_limit_perc;
|
|
||||||
uint8_t tdc_mawt;
|
|
||||||
uint8_t tdc_waterfall_ctl;
|
|
||||||
uint8_t dte_ambient_temp_base;
|
|
||||||
uint32_t display_cac;
|
|
||||||
uint32_t bapm_temp_gradient;
|
|
||||||
uint16_t bapmti_r[SMU72_DTE_ITERATIONS * SMU72_DTE_SOURCES * SMU72_DTE_SINKS];
|
|
||||||
uint16_t bapmti_rc[SMU72_DTE_ITERATIONS * SMU72_DTE_SOURCES * SMU72_DTE_SINKS];
|
|
||||||
};
|
|
||||||
|
|
||||||
int tonga_populate_all_graphic_levels(struct pp_hwmgr *hwmgr);
|
|
||||||
int tonga_populate_all_memory_levels(struct pp_hwmgr *hwmgr);
|
|
||||||
int tonga_init_smc_table(struct pp_hwmgr *hwmgr);
|
|
||||||
int tonga_thermal_setup_fan_table(struct pp_hwmgr *hwmgr);
|
|
||||||
int tonga_update_smc_table(struct pp_hwmgr *hwmgr, uint32_t type);
|
|
||||||
int tonga_update_sclk_threshold(struct pp_hwmgr *hwmgr);
|
|
||||||
uint32_t tonga_get_offsetof(uint32_t type, uint32_t member);
|
|
||||||
uint32_t tonga_get_mac_definition(uint32_t value);
|
|
||||||
int tonga_process_firmware_header(struct pp_hwmgr *hwmgr);
|
|
||||||
int tonga_initialize_mc_reg_table(struct pp_hwmgr *hwmgr);
|
|
||||||
bool tonga_is_dpm_running(struct pp_hwmgr *hwmgr);
|
|
||||||
int tonga_populate_requested_graphic_levels(struct pp_hwmgr *hwmgr,
|
|
||||||
struct amd_pp_profile *request);
|
|
||||||
#endif
|
|
||||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -25,8 +25,26 @@
|
||||||
#define _TONGA_SMUMGR_H_
|
#define _TONGA_SMUMGR_H_
|
||||||
|
|
||||||
#include "smu72_discrete.h"
|
#include "smu72_discrete.h"
|
||||||
|
|
||||||
#include "smu7_smumgr.h"
|
#include "smu7_smumgr.h"
|
||||||
|
#include "smu72.h"
|
||||||
|
|
||||||
|
|
||||||
|
#define ASICID_IS_TONGA_P(wDID, bRID) \
|
||||||
|
(((wDID == 0x6930) && ((bRID == 0xF0) || (bRID == 0xF1) || (bRID == 0xFF))) \
|
||||||
|
|| ((wDID == 0x6920) && ((bRID == 0) || (bRID == 1))))
|
||||||
|
|
||||||
|
struct tonga_pt_defaults {
|
||||||
|
uint8_t svi_load_line_en;
|
||||||
|
uint8_t svi_load_line_vddC;
|
||||||
|
uint8_t tdc_vddc_throttle_release_limit_perc;
|
||||||
|
uint8_t tdc_mawt;
|
||||||
|
uint8_t tdc_waterfall_ctl;
|
||||||
|
uint8_t dte_ambient_temp_base;
|
||||||
|
uint32_t display_cac;
|
||||||
|
uint32_t bapm_temp_gradient;
|
||||||
|
uint16_t bapmti_r[SMU72_DTE_ITERATIONS * SMU72_DTE_SOURCES * SMU72_DTE_SINKS];
|
||||||
|
uint16_t bapmti_rc[SMU72_DTE_ITERATIONS * SMU72_DTE_SOURCES * SMU72_DTE_SINKS];
|
||||||
|
};
|
||||||
|
|
||||||
struct tonga_mc_reg_entry {
|
struct tonga_mc_reg_entry {
|
||||||
uint32_t mclk_max;
|
uint32_t mclk_max;
|
||||||
|
|
Loading…
Reference in a new issue