Commit 28af436a authored by Yang Wang's avatar Yang Wang Committed by Alex Deucher
Browse files

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



unified vcn 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 8dbd641f

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

+1 −6
Original line number Diff line number Diff line
@@ -4144,12 +4144,7 @@ int smu_reset_sdma(struct smu_context *smu, uint32_t inst_mask) 


bool smu_reset_vcn_is_supported(struct smu_context *smu)

{

	bool ret = false;



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

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



	return ret;

	return smu_feature_cap_test(smu, SMU_FEATURE_CAP_ID__VCN_RESET);

}



int smu_reset_vcn(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
@@ -531,6 +531,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__VCN_RESET,

	SMU_FEATURE_CAP_ID__COUNT,

};
@@ -1438,10 +1439,6 @@ struct pptable_funcs { 
	 * @reset_vcn: message SMU to soft reset vcn instance.

	 */

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

	/**

	 * @reset_vcn_is_supported: Check if support resets vcn.

	 */

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



	/**

	 * @get_ecc_table:  message SMU to get ECC INFO table.

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

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

		smu_feature_cap_set(smu, SMU_FEATURE_CAP_ID__SDMA_RESET);



	if (smu_v13_0_6_reset_vcn_is_supported(smu))

		smu_feature_cap_set(smu, SMU_FEATURE_CAP_ID__VCN_RESET);



	return 0;

}
@@ -3917,7 +3920,6 @@ static const struct pptable_funcs smu_v13_0_6_ppt_funcs = { 
	.send_rma_reason = smu_v13_0_6_send_rma_reason,

	.reset_sdma = smu_v13_0_6_reset_sdma,

	.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,

};