Commit dc622367 authored by Perry Yuan's avatar Perry Yuan Committed by Alex Deucher
Browse files

drm/amdgpu: map new capped and uncapped mode power profiles for Vangogh 



Capped and Uncapped workload types are supported, each workload type
has different performance thresholds and pstate conditions.

* capped mode is used by power centric workload
* uncapped mode is used by perf centric workload

Acked-by: default avatarKenneth Feng <kenneth.feng@amd.com>
Reviewed-by: default avatarEvan Quan <evan.quan@amd.com>
Signed-off-by: default avatarPerry Yuan <perry.yuan@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 31865e96

drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu11_driver_if_vangogh.h

+3 −1
Original line number Diff line number Diff line
@@ -238,7 +238,9 @@ typedef struct { 
#define WORKLOAD_PPLIB_VR_BIT 3

#define WORKLOAD_PPLIB_COMPUTE_BIT 4

#define WORKLOAD_PPLIB_CUSTOM_BIT 5

#define WORKLOAD_PPLIB_COUNT 6

#define WORKLOAD_PPLIB_CAPPED_BIT 6

#define WORKLOAD_PPLIB_UNCAPPED_BIT 7

#define WORKLOAD_PPLIB_COUNT 8



#define TABLE_BIOS_IF            0 // Called by BIOS

#define TABLE_WATERMARKS         1 // Called by DAL through VBIOS

drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c

+4 −2
Original line number Diff line number Diff line
@@ -203,6 +203,8 @@ static struct cmn2asic_mapping vangogh_workload_map[PP_SMC_POWER_PROFILE_COUNT] 
	WORKLOAD_MAP(PP_SMC_POWER_PROFILE_VR,			WORKLOAD_PPLIB_VR_BIT),

	WORKLOAD_MAP(PP_SMC_POWER_PROFILE_COMPUTE,		WORKLOAD_PPLIB_COMPUTE_BIT),

	WORKLOAD_MAP(PP_SMC_POWER_PROFILE_CUSTOM,		WORKLOAD_PPLIB_CUSTOM_BIT),

	WORKLOAD_MAP(PP_SMC_POWER_PROFILE_CAPPED,		WORKLOAD_PPLIB_CAPPED_BIT),

	WORKLOAD_MAP(PP_SMC_POWER_PROFILE_UNCAPPED,		WORKLOAD_PPLIB_UNCAPPED_BIT),

};



static const uint8_t vangogh_throttler_map[] = {
@@ -1046,7 +1048,7 @@ static int vangogh_get_power_profile_mode(struct smu_context *smu, 
	if (!buf)

		return -EINVAL;



	for (i = 0; i <= PP_SMC_POWER_PROFILE_CUSTOM; i++) {

	for (i = 0; i < PP_SMC_POWER_PROFILE_COUNT; i++) {

		/*

		 * Conv PP_SMC_POWER_PROFILE* to WORKLOAD_PPLIB_*_BIT

		 * Not all profile modes are supported on vangogh.
@@ -1070,7 +1072,7 @@ static int vangogh_set_power_profile_mode(struct smu_context *smu, long *input, 
	int workload_type, ret;

	uint32_t profile_mode = input[size];



	if (profile_mode > PP_SMC_POWER_PROFILE_CUSTOM) {

	if (profile_mode >= PP_SMC_POWER_PROFILE_COUNT) {

		dev_err(smu->adev->dev, "Invalid power profile mode %d\n", profile_mode);

		return -EINVAL;

	}