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

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

drm/amd/powerplay: use smu7_hwmgr to manager tonga. 



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

drivers/gpu/drm/amd/powerplay/hwmgr/Makefile

+1 −3
Original line number Diff line number Diff line
@@ -4,12 +4,10 @@ 


HARDWARE_MGR = hwmgr.o processpptables.o functiontables.o \

		hardwaremanager.o pp_acpi.o cz_hwmgr.o \

		cz_clockpowergating.o tonga_powertune.o\

		cz_clockpowergating.o pppcielanes.o\

		process_pptables_v1_0.o ppatomctrl.o \

		tonga_hwmgr.o pppcielanes.o  tonga_thermal.o\

		smu7_hwmgr.o smu7_powertune.o smu7_thermal.o \

		smu7_clockpowergating.o iceland_hwmgr.o \

		tonga_clockpowergating.o \

		iceland_clockpowergating.o iceland_thermal.o \

		iceland_powertune.o

drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c

+29 −3
Original line number Diff line number Diff line
@@ -36,13 +36,13 @@ 
#include "amd_acpi.h"



extern int cz_hwmgr_init(struct pp_hwmgr *hwmgr);

extern int tonga_hwmgr_init(struct pp_hwmgr *hwmgr);

extern int iceland_hwmgr_init(struct pp_hwmgr *hwmgr);



static int polaris_set_asic_special_caps(struct pp_hwmgr *hwmgr);

static void hwmgr_init_default_caps(struct pp_hwmgr *hwmgr);

static int hwmgr_set_user_specify_caps(struct pp_hwmgr *hwmgr);

static int fiji_set_asic_special_caps(struct pp_hwmgr *hwmgr);

static int tonga_set_asic_special_caps(struct pp_hwmgr *hwmgr);



uint8_t convert_to_vid(uint16_t vddc)

{
@@ -82,9 +82,11 @@ int hwmgr_init(struct amd_pp_init *pp_init, struct pp_instance *handle) 
			iceland_hwmgr_init(hwmgr);

			break;

		case CHIP_TONGA:

			tonga_hwmgr_init(hwmgr);

			smu7_hwmgr_init(hwmgr);

			tonga_set_asic_special_caps(hwmgr);

			hwmgr->feature_mask &= ~(PP_SMC_VOLTAGE_CONTROL_MASK |

						PP_VBI_TIME_SUPPORT_MASK);

			break;



		case CHIP_FIJI:

			smu7_hwmgr_init(hwmgr);

			fiji_set_asic_special_caps(hwmgr);
@@ -768,3 +770,27 @@ int fiji_set_asic_special_caps(struct pp_hwmgr *hwmgr) 
	return 0;

}



int tonga_set_asic_special_caps(struct pp_hwmgr *hwmgr)

{

	phm_cap_unset(hwmgr->platform_descriptor.platformCaps,

			PHM_PlatformCaps_SQRamping);

	phm_cap_unset(hwmgr->platform_descriptor.platformCaps,

			PHM_PlatformCaps_DBRamping);

	phm_cap_unset(hwmgr->platform_descriptor.platformCaps,

			PHM_PlatformCaps_TDRamping);

	phm_cap_unset(hwmgr->platform_descriptor.platformCaps,

			PHM_PlatformCaps_TCPRamping);



	phm_cap_unset(hwmgr->platform_descriptor.platformCaps,

		      PHM_PlatformCaps_UVDPowerGating);

	phm_cap_unset(hwmgr->platform_descriptor.platformCaps,

		      PHM_PlatformCaps_VCEPowerGating);



	phm_cap_set(hwmgr->platform_descriptor.platformCaps,

			 PHM_PlatformCaps_TablelessHardwareInterface);



	phm_cap_set(hwmgr->platform_descriptor.platformCaps,

			PHM_PlatformCaps_CAC);



	return 0;

}