]> www.infradead.org Git - users/hch/misc.git/commitdiff
drm/amdgpu/sdam: Skip SDMA queue reset for SRIOV
authorAhmad Rehman <Ahmad.Rehman@amd.com>
Tue, 18 Mar 2025 03:41:47 +0000 (23:41 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 21 Mar 2025 16:15:08 +0000 (12:15 -0400)
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>
drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c

index fd34dc13808110cf010d1fbfe29eff81d08742ec..e77c99180fa3200085a92b99e6902f87c612ce6c 100644 (file)
@@ -1666,6 +1666,10 @@ static int sdma_v4_4_2_reset_queue(struct amdgpu_ring *ring, unsigned int vmid)
 {
        struct amdgpu_device *adev = ring->adev;
        u32 id = GET_INST(SDMA0, ring->me);
+
+       if (!(adev->sdma.supported_reset & AMDGPU_RESET_TYPE_PER_QUEUE))
+               return -EOPNOTSUPP;
+
        return amdgpu_sdma_reset_engine(adev, id, true);
 }
 
@@ -2347,6 +2351,9 @@ static void sdma_v4_4_2_set_vm_pte_funcs(struct amdgpu_device *adev)
  */
 static void sdma_v4_4_2_update_reset_mask(struct amdgpu_device *adev)
 {
+       /* per queue reset not supported for SRIOV */
+       if (amdgpu_sriov_vf(adev))
+               return;
 
        /*
         * the user queue relies on MEC fw and pmfw when the sdma queue do reset.