Skip to content
Snippets Groups Projects
Commit 142ceb5d authored by Ahmad Rehman's avatar Ahmad Rehman Committed by Alex Deucher
Browse files

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: default avatarAhmad Rehman <Ahmad.Rehman@amd.com>
Reviewed-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 0419eeb9
No related merge requests found
...@@ -1666,6 +1666,10 @@ static int sdma_v4_4_2_reset_queue(struct amdgpu_ring *ring, unsigned int vmid) ...@@ -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; struct amdgpu_device *adev = ring->adev;
u32 id = GET_INST(SDMA0, ring->me); 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); 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) ...@@ -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) 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. * the user queue relies on MEC fw and pmfw when the sdma queue do reset.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment