Skip to content

Commit 01b4ae3

Browse files
jiadozhualexdeucher
authored andcommitted
drm/amdgpu/mes: implement amdgpu_mes_reset_hw_queue_mmio
The reset_queue api could be used from kfd or kgd. v2: add use_mmio parameter for mes_reset_legacy_queue. Acked-by: Vitaly Prosyak <[email protected]> Signed-off-by: Jiadong Zhu <[email protected]> Reviewed-by: Alex Deucher <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent 8b2429a commit 01b4ae3

File tree

1 file changed

+20
-0
lines changed

1 file changed

+20
-0
lines changed

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -826,6 +826,24 @@ int amdgpu_mes_reset_hw_queue(struct amdgpu_device *adev, int queue_id)
826826
return 0;
827827
}
828828

829+
int amdgpu_mes_reset_hw_queue_mmio(struct amdgpu_device *adev, int queue_type,
830+
int me_id, int pipe_id, int queue_id, int vmid)
831+
{
832+
struct mes_reset_queue_input queue_input;
833+
int r;
834+
835+
queue_input.use_mmio = true;
836+
queue_input.me_id = me_id;
837+
queue_input.pipe_id = pipe_id;
838+
queue_input.queue_id = queue_id;
839+
queue_input.vmid = vmid;
840+
r = adev->mes.funcs->reset_hw_queue(&adev->mes, &queue_input);
841+
if (r)
842+
DRM_ERROR("failed to reset hardware queue by mmio, queue id = %d\n",
843+
queue_id);
844+
return r;
845+
}
846+
829847
int amdgpu_mes_map_legacy_queue(struct amdgpu_device *adev,
830848
struct amdgpu_ring *ring)
831849
{
@@ -883,11 +901,13 @@ int amdgpu_mes_reset_legacy_queue(struct amdgpu_device *adev,
883901

884902
queue_input.queue_type = ring->funcs->type;
885903
queue_input.doorbell_offset = ring->doorbell_index;
904+
queue_input.me_id = ring->me;
886905
queue_input.pipe_id = ring->pipe;
887906
queue_input.queue_id = ring->queue;
888907
queue_input.mqd_addr = amdgpu_bo_gpu_offset(ring->mqd_obj);
889908
queue_input.wptr_addr = ring->wptr_gpu_addr;
890909
queue_input.vmid = vmid;
910+
queue_input.use_mmio = use_mmio;
891911

892912
r = adev->mes.funcs->reset_legacy_queue(&adev->mes, &queue_input);
893913
if (r)

0 commit comments

Comments
 (0)