Skip to content

Commit 290ccae

Browse files
committed
drm/amdgpu/vcn: don't enable per queue resets on SR-IOV
Power control is only available in bare metal. SR-IOV will need a different method. Reviewed-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent 94ee19e commit 290ccae

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,8 @@ static int vcn_v4_0_sw_init(struct amdgpu_ip_block *ip_block)
241241

242242
adev->vcn.supported_reset =
243243
amdgpu_get_soft_full_reset_mask(&adev->vcn.inst[0].ring_enc[0]);
244-
adev->vcn.supported_reset |= AMDGPU_RESET_TYPE_PER_QUEUE;
244+
if (!amdgpu_sriov_vf(adev))
245+
adev->vcn.supported_reset |= AMDGPU_RESET_TYPE_PER_QUEUE;
245246

246247
if (amdgpu_sriov_vf(adev)) {
247248
r = amdgpu_virt_alloc_mm_table(adev);

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,8 @@ static int vcn_v4_0_5_sw_init(struct amdgpu_ip_block *ip_block)
220220
}
221221

222222
adev->vcn.supported_reset = amdgpu_get_soft_full_reset_mask(&adev->vcn.inst[0].ring_enc[0]);
223-
adev->vcn.supported_reset |= AMDGPU_RESET_TYPE_PER_QUEUE;
223+
if (!amdgpu_sriov_vf(adev))
224+
adev->vcn.supported_reset |= AMDGPU_RESET_TYPE_PER_QUEUE;
224225

225226
r = amdgpu_vcn_sysfs_reset_mask_init(adev);
226227
if (r)

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,8 @@ static int vcn_v5_0_0_sw_init(struct amdgpu_ip_block *ip_block)
198198

199199
adev->vcn.supported_reset =
200200
amdgpu_get_soft_full_reset_mask(&adev->vcn.inst[0].ring_enc[0]);
201-
adev->vcn.supported_reset |= AMDGPU_RESET_TYPE_PER_QUEUE;
201+
if (!amdgpu_sriov_vf(adev))
202+
adev->vcn.supported_reset |= AMDGPU_RESET_TYPE_PER_QUEUE;
202203

203204
vcn_v5_0_0_alloc_ip_dump(adev);
204205

0 commit comments

Comments
 (0)