Commit b8870118 authored by Evan Quan's avatar Evan Quan Committed by Alex Deucher
Browse files

drm/amd/powerplay: correct navi10 vcn powergate 



vcn dpm on is a prerequisite for vcn power gate control.

Signed-off-by: default avatarEvan Quan <evan.quan@amd.com>
Reviewed-by: default avatarKenneth Feng <kenneth.feng@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 8ecd998d

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

+3 −1
Original line number Diff line number Diff line
@@ -315,6 +315,8 @@ int smu_get_power_num_states(struct smu_context *smu, 
int smu_common_read_sensor(struct smu_context *smu, enum amd_pp_sensors sensor,

			   void *data, uint32_t *size)

{

	struct smu_power_context *smu_power = &smu->smu_power;

	struct smu_power_gate *power_gate = &smu_power->power_gate;

	int ret = 0;



	switch (sensor) {
@@ -339,7 +341,7 @@ int smu_common_read_sensor(struct smu_context *smu, enum amd_pp_sensors sensor, 
		*size = 4;

		break;

	case AMDGPU_PP_SENSOR_VCN_POWER_STATE:

		*(uint32_t *)data = smu_feature_is_enabled(smu, SMU_FEATURE_VCN_PG_BIT) ? 1 : 0;

		*(uint32_t *)data = power_gate->vcn_gated ? 0 : 1;

		*size = 4;

		break;

	default:

drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h

+1 −0
Original line number Diff line number Diff line
@@ -451,6 +451,7 @@ struct smu_dpm_context { 
struct smu_power_gate {

	bool uvd_gated;

	bool vce_gated;

	bool vcn_gated;

};



struct smu_power_context {

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

+15 −8
Original line number Diff line number Diff line
@@ -605,19 +605,26 @@ static int navi10_set_default_dpm_table(struct smu_context *smu) 


static int navi10_dpm_set_uvd_enable(struct smu_context *smu, bool enable)

{

	struct smu_power_context *smu_power = &smu->smu_power;

	struct smu_power_gate *power_gate = &smu_power->power_gate;

	int ret = 0;



	if (enable) {

		/* vcn dpm on is a prerequisite for vcn power gate messages */

		if (smu_feature_is_enabled(smu, SMU_FEATURE_VCN_PG_BIT)) {

			ret = smu_send_smc_msg_with_param(smu, SMU_MSG_PowerUpVcn, 1);

			if (ret)

				return ret;

		}

		power_gate->vcn_gated = false;

	} else {

		if (smu_feature_is_enabled(smu, SMU_FEATURE_VCN_PG_BIT)) {

			ret = smu_send_smc_msg(smu, SMU_MSG_PowerDownVcn);

			if (ret)

				return ret;

		}



	ret = smu_feature_set_enabled(smu, SMU_FEATURE_VCN_PG_BIT, enable);

		power_gate->vcn_gated = true;

	}



	return ret;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE