Before destroying the userq buffer object, it requires validating
the userq unmap status and ensuring the userq is unmapped from
hardware.

Signed-off-by: Prike Liang <[email protected]>
Reviewed-by: Alex Deucher <[email protected]>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
index 7f9dfeae4322..c7c9f9e597f1 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
@@ -319,6 +319,11 @@ amdgpu_userq_destroy(struct drm_file *filp, int queue_id)
        }
        amdgpu_bo_unref(&queue->db_obj.obj);
        r = amdgpu_userq_unmap_helper(uq_mgr, queue);
+       /*TODO: It requires a reset for unmap error*/
+       if (r != AMDGPU_USERQ_STATE_UNMAPPED) {
+               drm_warn(adev_to_drm(uq_mgr->adev), "trying to destroy a HW 
mapping userq\n");
+               r = -ETIMEDOUT;
+       }
        amdgpu_userq_cleanup(uq_mgr, queue, queue_id);
        mutex_unlock(&uq_mgr->userq_mutex);
 
-- 
2.34.1

Reply via email to