Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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: Shikang Fan <shikang.fan@amd.com>
Reviewed-by: Lijo Lazar <lijo.lazar@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
(cherry picked from commit ee9b603ad43f9870eb75184f9fb0a84f8c3cc852)
Cc: stable@vger.kernel.org
authored by
Shikang Fan
and committed by
Alex Deucher
c156c7f2
21f46f54
+4
-2
+1
-1
drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c
+1
-1
drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c
···
141
141
adev->vcn.supported_reset =
142
142
amdgpu_get_soft_full_reset_mask(&adev->vcn.inst[0].ring_enc[0]);
143
143
144
-
if (amdgpu_dpm_reset_vcn_is_supported(adev))
144
+
if (amdgpu_dpm_reset_vcn_is_supported(adev) && !amdgpu_sriov_vf(adev))
145
145
adev->vcn.supported_reset |= AMDGPU_RESET_TYPE_PER_QUEUE;
146
146
147
147
return 0;
+3
-1
drivers/gpu/drm/amd/amdgpu/vcn_v5_0_1.c
+3
-1
drivers/gpu/drm/amd/amdgpu/vcn_v5_0_1.c
···
122
122
123
123
switch (amdgpu_ip_version(adev, MP0_HWIP, 0)) {
124
124
case IP_VERSION(13, 0, 12):
125
-
if ((adev->psp.sos.fw_version >= 0x00450025) && amdgpu_dpm_reset_vcn_is_supported(adev))
125
+
if ((adev->psp.sos.fw_version >= 0x00450025) &&
126
+
amdgpu_dpm_reset_vcn_is_supported(adev) &&
127
+
!amdgpu_sriov_vf(adev))
126
128
adev->vcn.supported_reset |= AMDGPU_RESET_TYPE_PER_QUEUE;
127
129
break;
128
130
default: