Commit c156c7f2 authored by Shikang Fan's avatar Shikang Fan Committed by Alex Deucher
Browse files

drm/amdgpu: Add sriov vf check for VCN per queue reset support. 



Add SRIOV check when setting VCN ring's supported reset mask.

Signed-off-by: default avatarShikang Fan <shikang.fan@amd.com>
Reviewed-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
(cherry picked from commit ee9b603a)
Cc: stable@vger.kernel.org
parent 21f46f54

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

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ static int vcn_v4_0_3_late_init(struct amdgpu_ip_block *ip_block) 
	adev->vcn.supported_reset =

		amdgpu_get_soft_full_reset_mask(&adev->vcn.inst[0].ring_enc[0]);



	if (amdgpu_dpm_reset_vcn_is_supported(adev))

	if (amdgpu_dpm_reset_vcn_is_supported(adev) && !amdgpu_sriov_vf(adev))

		adev->vcn.supported_reset |= AMDGPU_RESET_TYPE_PER_QUEUE;



	return 0;

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

+3 −1
Original line number Diff line number Diff line
@@ -122,7 +122,9 @@ static int vcn_v5_0_1_late_init(struct amdgpu_ip_block *ip_block) 


	switch (amdgpu_ip_version(adev, MP0_HWIP, 0)) {

	case IP_VERSION(13, 0, 12):

		if ((adev->psp.sos.fw_version >= 0x00450025) && amdgpu_dpm_reset_vcn_is_supported(adev))

		if ((adev->psp.sos.fw_version >= 0x00450025) &&

			amdgpu_dpm_reset_vcn_is_supported(adev) &&

			!amdgpu_sriov_vf(adev))

			adev->vcn.supported_reset |= AMDGPU_RESET_TYPE_PER_QUEUE;

		break;

	default: