Commit 8dbd641f authored by Yang Wang's avatar Yang Wang Committed by Alex Deucher
Browse files

drm/amd/pm: unified smu feature cap for sdma reset 



unified sdma reset smu feature cap

Signed-off-by: default avatarYang Wang <kevinyang.wang@amd.com>
Reviewed-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 7a1e3cfe

drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c

+1 −6
Original line number Diff line number Diff line
@@ -4129,12 +4129,7 @@ int smu_send_rma_reason(struct smu_context *smu) 
 */

bool smu_reset_sdma_is_supported(struct smu_context *smu)

{

	bool ret = false;



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

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



	return ret;

	return smu_feature_cap_test(smu, SMU_FEATURE_CAP_ID__SDMA_RESET);

}



int smu_reset_sdma(struct smu_context *smu, uint32_t inst_mask)

drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h

+1 −4
Original line number Diff line number Diff line
@@ -530,6 +530,7 @@ enum smu_fw_status { 


enum smu_feature_cap_id {

	SMU_FEATURE_CAP_ID__LINK_RESET = 0,

	SMU_FEATURE_CAP_ID__SDMA_RESET,

	SMU_FEATURE_CAP_ID__COUNT,

};
@@ -1432,10 +1433,6 @@ struct pptable_funcs { 
	 * @reset_sdma: message SMU to soft reset sdma instance.

	 */

	int (*reset_sdma)(struct smu_context *smu, uint32_t inst_mask);

	/**

	 * @reset_sdma_is_supported: Check if support resets the SDMA engine.

	 */

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



	/**

	 * @reset_vcn: message SMU to soft reset vcn instance.

drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c

+3 −1
Original line number Diff line number Diff line
@@ -3232,6 +3232,9 @@ static int smu_v13_0_6_post_init(struct smu_context *smu) 
	if (smu_v13_0_6_is_link_reset_supported(smu))

		smu_feature_cap_set(smu, SMU_FEATURE_CAP_ID__LINK_RESET);



	if (smu_v13_0_6_reset_sdma_is_supported(smu))

		smu_feature_cap_set(smu, SMU_FEATURE_CAP_ID__SDMA_RESET);



	return 0;

}
@@ -3913,7 +3916,6 @@ static const struct pptable_funcs smu_v13_0_6_ppt_funcs = { 
	.send_hbm_bad_pages_num = smu_v13_0_6_smu_send_hbm_bad_page_num,

	.send_rma_reason = smu_v13_0_6_send_rma_reason,

	.reset_sdma = smu_v13_0_6_reset_sdma,

	.reset_sdma_is_supported = smu_v13_0_6_reset_sdma_is_supported,

	.dpm_reset_vcn = smu_v13_0_6_reset_vcn,

	.reset_vcn_is_supported = smu_v13_0_6_reset_vcn_is_supported,

	.post_init = smu_v13_0_6_post_init,