Skip to content

Commit cfdf8b3

Browse files
ahrehmanalexdeucher
authored andcommitted
drm/amdgpu/sdam: Skip SDMA queue reset for SRIOV
For SRIOV, skip the SDMA queue reset and return error. The engine/queue reset failure will trigger FLR in the sequence. v2: do not add queue reset support mask for sriov Signed-off-by: Ahmad Rehman <Ahmad.Rehman@amd.com> Reviewed-by: Lijo Lazar <lijo.lazar@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent 0a59fbd commit cfdf8b3

1 file changed

Lines changed: 7 additions & 0 deletions

File tree

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1666,6 +1666,10 @@ static int sdma_v4_4_2_reset_queue(struct amdgpu_ring *ring, unsigned int vmid)
16661666
{
16671667
struct amdgpu_device *adev = ring->adev;
16681668
u32 id = GET_INST(SDMA0, ring->me);
1669+
1670+
if (!(adev->sdma.supported_reset & AMDGPU_RESET_TYPE_PER_QUEUE))
1671+
return -EOPNOTSUPP;
1672+
16691673
return amdgpu_sdma_reset_engine(adev, id, true);
16701674
}
16711675

@@ -2347,6 +2351,9 @@ static void sdma_v4_4_2_set_vm_pte_funcs(struct amdgpu_device *adev)
23472351
*/
23482352
static void sdma_v4_4_2_update_reset_mask(struct amdgpu_device *adev)
23492353
{
2354+
/* per queue reset not supported for SRIOV */
2355+
if (amdgpu_sriov_vf(adev))
2356+
return;
23502357

23512358
/*
23522359
* the user queue relies on MEC fw and pmfw when the sdma queue do reset.

0 commit comments

Comments
 (0)