From: Alex Deucher <[email protected]> Query the status of the user queue, currently whether the queue is hung and whether or not VRAM is lost.
v2: Misc cleanups Reviewed-by: Prike Liang <[email protected]> Reviewed-by: Sunil Khatri <[email protected]> Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Prike Liang <[email protected]> --- drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c | 35 +++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h | 1 + 2 files changed, 36 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c index 3938f7b8ec4b..1be5e70dd4e8 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c @@ -692,6 +692,7 @@ amdgpu_userq_create(struct drm_file *filp, union drm_amdgpu_userq *args) queue->queue_type = args->in.ip_type; queue->vm = &fpriv->vm; queue->priority = priority; + queue->generation = amdgpu_vm_generation(adev, &fpriv->vm); queue->xcp_id = (fpriv->xcp_id != AMDGPU_XCP_NO_PARTITION) ? fpriv->xcp_id : 0; queue->userq_mgr = uq_mgr; @@ -812,6 +813,34 @@ amdgpu_userq_create(struct drm_file *filp, union drm_amdgpu_userq *args) return r; } +static int +amdgpu_userq_query_status(struct drm_file *filp, union drm_amdgpu_userq *args) +{ + struct amdgpu_fpriv *fpriv = filp->driver_priv; + struct amdgpu_userq_mgr *uq_mgr = &fpriv->userq_mgr; + struct amdgpu_device *adev = uq_mgr->adev; + struct amdgpu_usermode_queue *queue; + int queue_id = args->in.queue_id; + + mutex_lock(&uq_mgr->userq_mutex); + + queue = amdgpu_userq_get(uq_mgr, queue_id); + if (!queue) { + mutex_unlock(&uq_mgr->userq_mutex); + return -EINVAL; + } + + args->out_qs.flags = 0; + if (queue->state == AMDGPU_USERQ_STATE_HUNG) + args->out_qs.flags |= AMDGPU_USERQ_QUERY_STATUS_FLAGS_HUNG; + if (queue->generation != amdgpu_vm_generation(adev, &fpriv->vm)) + args->out_qs.flags |= AMDGPU_USERQ_QUERY_STATUS_FLAGS_VRAMLOST; + amdgpu_userq_put(queue); + mutex_unlock(&uq_mgr->userq_mutex); + + return 0; +} + static int amdgpu_userq_input_args_validate(struct drm_device *dev, union drm_amdgpu_userq *args, struct drm_file *filp) @@ -933,6 +962,12 @@ int amdgpu_userq_ioctl(struct drm_device *dev, void *data, break; } + case AMDGPU_USERQ_OP_QUERY_STATUS: + r = amdgpu_userq_query_status(filp, args); + if (r) + drm_dbg_driver(dev, "Failed to query usermode queue status\n"); + break; + default: drm_dbg_driver(dev, "Invalid user queue op specified: %d\n", args->in.op); return -EINVAL; diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h index 6412a7f7b6ef..40228c60a1ea 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h @@ -79,6 +79,7 @@ struct amdgpu_usermode_queue { struct dma_fence *last_fence; u32 xcp_id; int priority; + uint64_t generation; struct dentry *debugfs_queue; /** -- 2.34.1
