drm/amdgpu/mes: add API for user queue reset

Add API for resetting user queues.

Acked-by: Vitaly Prosyak <vitaly.prosyak@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c
index c598c3edff7eebf117359c12b28dc4068c42237e..04a4f0dfec1552d60845df3f3724166bd2fac77a 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c
@@ -793,6 +793,49 @@ int amdgpu_mes_remove_hw_queue(struct amdgpu_device *adev, int queue_id)
        return 0;
 }
 
+int amdgpu_mes_reset_hw_queue(struct amdgpu_device *adev, int queue_id)
+{
+       unsigned long flags;
+       struct amdgpu_mes_queue *queue;
+       struct amdgpu_mes_gang *gang;
+       struct mes_reset_queue_input queue_input;
+       int r;
+
+       /*
+        * Avoid taking any other locks under MES lock to avoid circular
+        * lock dependencies.
+        */
+       amdgpu_mes_lock(&adev->mes);
+
+       /* remove the mes gang from idr list */
+       spin_lock_irqsave(&adev->mes.queue_id_lock, flags);
+
+       queue = idr_find(&adev->mes.queue_id_idr, queue_id);
+       if (!queue) {
+               spin_unlock_irqrestore(&adev->mes.queue_id_lock, flags);
+               amdgpu_mes_unlock(&adev->mes);
+               DRM_ERROR("queue id %d doesn't exist\n", queue_id);
+               return -EINVAL;
+       }
+       spin_unlock_irqrestore(&adev->mes.queue_id_lock, flags);
+
+       DRM_DEBUG("try to reset queue, doorbell off = 0x%llx\n",
+                 queue->doorbell_off);
+
+       gang = queue->gang;
+       queue_input.doorbell_offset = queue->doorbell_off;
+       queue_input.gang_context_addr = gang->gang_ctx_gpu_addr;
+
+       r = adev->mes.funcs->reset_hw_queue(&adev->mes, &queue_input);
+       if (r)
+               DRM_ERROR("failed to reset hardware queue, queue id = %d\n",
+                         queue_id);
+
+       amdgpu_mes_unlock(&adev->mes);
+
+       return 0;
+}
+
 int amdgpu_mes_map_legacy_queue(struct amdgpu_device *adev,
                                struct amdgpu_ring *ring)
 {

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h
index 548e724e3a750fc75e86e109ae5a60e5151b00b9..5c8867d2380af599c1b69cb18aa7c1c7cbecb909 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h
@@ -248,6 +248,11 @@ struct mes_remove_queue_input {
        uint64_t        gang_context_addr;
 };
 
+struct mes_reset_queue_input {
+       uint32_t        doorbell_offset;
+       uint64_t        gang_context_addr;
+};
+
 struct mes_map_legacy_queue_input {
        uint32_t                           queue_type;
        uint32_t                           doorbell_offset;
@@ -360,6 +365,9 @@ struct amdgpu_mes_funcs {
 
        int (*reset_legacy_queue)(struct amdgpu_mes *mes,
                                  struct mes_reset_legacy_queue_input *input);
+
+       int (*reset_hw_queue)(struct amdgpu_mes *mes,
+                             struct mes_reset_queue_input *input);
 };
 
 #define amdgpu_mes_kiq_hw_init(adev) (adev)->mes.kiq_hw_init((adev))
@@ -387,6 +395,7 @@ int amdgpu_mes_add_hw_queue(struct amdgpu_device *adev, int gang_id,
                            struct amdgpu_mes_queue_properties *qprops,
                            int *queue_id);
 int amdgpu_mes_remove_hw_queue(struct amdgpu_device *adev, int queue_id);
+int amdgpu_mes_reset_hw_queue(struct amdgpu_device *adev, int queue_id);
 
 int amdgpu_mes_map_legacy_queue(struct amdgpu_device *adev,
                                struct amdgpu_ring *ring);