Commit d4631cba authored by Huang Rui's avatar Huang Rui Committed by Alex Deucher
Browse files

drm/amd/powerplay: move setting allowed mask and feature enabling together 



This patch moves setting allowed mask and feature enabling together to refine
the programming sequence.

Signed-off-by: default avatarHuang Rui <ray.huang@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 2dd1209e

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

+4 −4
Original line number Diff line number Diff line
@@ -586,10 +586,6 @@ static int smu_smc_table_hw_init(struct smu_context *smu, 
	if (ret)

		return ret;



	ret = smu_feature_set_allowed_mask(smu);

	if (ret)

		return ret;



	if (initialize) {

		ret = smu_read_pptable_from_vbios(smu);

		if (ret)
@@ -654,6 +650,10 @@ static int smu_smc_table_hw_init(struct smu_context *smu, 
	if (ret)

		return ret;



	ret = smu_feature_set_allowed_mask(smu);

	if (ret)

		return ret;



	ret = smu_system_features_control(smu, true);

	if (ret)

		return ret;