To make it consistent with signal ioctl.
Signed-off-by: David Rosca <[email protected]>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c | 8 ++++----
include/uapi/drm/amdgpu_drm.h | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c
index 5b2cdc49a28c..a9d51b38b7d3 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c
@@ -674,7 +674,7 @@ int amdgpu_userq_wait_ioctl(struct drm_device *dev, void
*data,
struct drm_amdgpu_userq_wait *wait_info = data;
struct amdgpu_fpriv *fpriv = filp->driver_priv;
struct amdgpu_userq_mgr *userq_mgr = &fpriv->userq_mgr;
- struct amdgpu_usermode_queue *waitq;
+ struct amdgpu_usermode_queue *queue;
struct drm_gem_object **gobj_write;
struct drm_gem_object **gobj_read;
struct dma_fence **fences = NULL;
@@ -930,8 +930,8 @@ int amdgpu_userq_wait_ioctl(struct drm_device *dev, void
*data,
*/
num_fences = dma_fence_dedup_array(fences, num_fences);
- waitq = idr_find(&userq_mgr->userq_idr, wait_info->waitq_id);
- if (!waitq) {
+ queue = idr_find(&userq_mgr->userq_idr, wait_info->queue_id);
+ if (!queue) {
r = -EINVAL;
goto free_fences;
}
@@ -964,7 +964,7 @@ int amdgpu_userq_wait_ioctl(struct drm_device *dev, void
*data,
* Otherwise, we would gather those references until we
don't
* have any more space left and crash.
*/
- r = xa_alloc(&waitq->fence_drv_xa, &index, fence_drv,
+ r = xa_alloc(&queue->fence_drv_xa, &index, fence_drv,
xa_limit_32b, GFP_KERNEL);
if (r)
goto free_fences;
diff --git a/include/uapi/drm/amdgpu_drm.h b/include/uapi/drm/amdgpu_drm.h
index 197ea3bfb559..6d4bf401f783 100644
--- a/include/uapi/drm/amdgpu_drm.h
+++ b/include/uapi/drm/amdgpu_drm.h
@@ -530,7 +530,7 @@ struct drm_amdgpu_userq_wait {
* @waitq_id: Queue handle used by the userq wait IOCTL to retrieve the
* wait queue and maintain the fence driver references in it.
*/
- __u32 waitq_id;
+ __u32 queue_id;
__u32 pad;
/**
* @syncobj_handles: The list of syncobj handles submitted by the user
queue
--
2.43.0
