Commit ea8139d8 authored by Wenhui Sheng's avatar Wenhui Sheng Committed by Alex Deucher
Browse files

drm/amd/powerplay: add SMU mode1 reset 



From PM FW 58.26.0 for sienna cichlid, SMU mode1 reset
is support, driver sends PPSMC_MSG_Mode1Reset message
to PM FW could trigger this reset.

v2: add mode1 reset dpm interface
v3: change maro name

Signed-off-by: default avatarLikun Gao <Likun.Gao@amd.com>
Signed-off-by: default avatarWenhui Sheng <Wenhui.Sheng@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent a4497974

drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c

+20 −0
Original line number Diff line number Diff line
@@ -1139,6 +1139,26 @@ int amdgpu_dpm_baco_reset(struct amdgpu_device *adev) 
	return 0;

}



bool amdgpu_dpm_is_mode1_reset_supported(struct amdgpu_device *adev)

{

	struct smu_context *smu = &adev->smu;



	if (is_support_sw_smu(adev))

		return smu_mode1_reset_is_support(smu);



	return false;

}



int amdgpu_dpm_mode1_reset(struct amdgpu_device *adev)

{

	struct smu_context *smu = &adev->smu;



	if (is_support_sw_smu(adev))

		return smu_mode1_reset(smu);



	return -EOPNOTSUPP;

}



int amdgpu_dpm_switch_power_profile(struct amdgpu_device *adev,

				    enum PP_SMC_POWER_PROFILE type,

				    bool en)

drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h

+3 −0
Original line number Diff line number Diff line
@@ -529,6 +529,9 @@ int amdgpu_dpm_mode2_reset(struct amdgpu_device *adev); 


bool amdgpu_dpm_is_baco_supported(struct amdgpu_device *adev);



bool amdgpu_dpm_is_mode1_reset_supported(struct amdgpu_device *adev);

int amdgpu_dpm_mode1_reset(struct amdgpu_device *adev);



int amdgpu_dpm_set_mp1_state(struct amdgpu_device *adev,

			     enum pp_mp1_state mp1_state);

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

+34 −0
Original line number Diff line number Diff line
@@ -2616,6 +2616,40 @@ int smu_baco_exit(struct smu_context *smu) 
	return ret;

}



bool smu_mode1_reset_is_support(struct smu_context *smu)

{

	bool ret = false;



	if (!smu->pm_enabled)

		return false;



	mutex_lock(&smu->mutex);



	if (smu->ppt_funcs && smu->ppt_funcs->mode1_reset_is_support)

		ret = smu->ppt_funcs->mode1_reset_is_support(smu);



	mutex_unlock(&smu->mutex);



	return ret;

}



int smu_mode1_reset(struct smu_context *smu)

{

	int ret = 0;



	if (!smu->pm_enabled)

		return -EOPNOTSUPP;



	mutex_lock(&smu->mutex);



	if (smu->ppt_funcs->mode1_reset)

		ret = smu->ppt_funcs->mode1_reset(smu);



	mutex_unlock(&smu->mutex);



	return ret;

}



int smu_mode2_reset(struct smu_context *smu)

{

	int ret = 0;

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

+4 −0
Original line number Diff line number Diff line
@@ -557,6 +557,8 @@ struct pptable_funcs { 
	int (*baco_set_state)(struct smu_context *smu, enum smu_baco_state state);

	int (*baco_enter)(struct smu_context *smu);

	int (*baco_exit)(struct smu_context *smu);

	bool (*mode1_reset_is_support)(struct smu_context *smu);

	int (*mode1_reset)(struct smu_context *smu);

	int (*mode2_reset)(struct smu_context *smu);

	int (*get_dpm_ultimate_freq)(struct smu_context *smu, enum smu_clk_type clk_type, uint32_t *min, uint32_t *max);

	int (*set_soft_freq_limited_range)(struct smu_context *smu, enum smu_clk_type clk_type, uint32_t min, uint32_t max);
@@ -668,6 +670,8 @@ int smu_baco_get_state(struct smu_context *smu, enum smu_baco_state *state); 
int smu_baco_enter(struct smu_context *smu);

int smu_baco_exit(struct smu_context *smu);



bool smu_mode1_reset_is_support(struct smu_context *smu);

int smu_mode1_reset(struct smu_context *smu);

int smu_mode2_reset(struct smu_context *smu);



extern int smu_get_atom_data_table(struct smu_context *smu, uint32_t table,

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

+1 −0
Original line number Diff line number Diff line
@@ -173,6 +173,7 @@ 
	__SMU_DUMMY_MAP(GmiPwrDnControl), \

	__SMU_DUMMY_MAP(DAL_DISABLE_DUMMY_PSTATE_CHANGE), \

	__SMU_DUMMY_MAP(DAL_ENABLE_DUMMY_PSTATE_CHANGE), \

	__SMU_DUMMY_MAP(Mode1Reset), \



#undef __SMU_DUMMY_MAP

#define __SMU_DUMMY_MAP(type)	SMU_MSG_##type