Commit e14a07fc authored by Eric Anholt's avatar Eric Anholt

drm/v3d: Drop the "dev" argument to lock/unlock of BO reservations.

They were unused, as Dave Emett noticed in TFU review.
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
Cc: Dave Emett <david.emett@broadcom.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181128230927.10951-2-eric@anholt.netReviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 1584f16c
...@@ -219,8 +219,7 @@ v3d_attach_object_fences(struct v3d_bo **bos, int bo_count, ...@@ -219,8 +219,7 @@ v3d_attach_object_fences(struct v3d_bo **bos, int bo_count,
} }
static void static void
v3d_unlock_bo_reservations(struct drm_device *dev, v3d_unlock_bo_reservations(struct v3d_bo **bos,
struct v3d_bo **bos,
int bo_count, int bo_count,
struct ww_acquire_ctx *acquire_ctx) struct ww_acquire_ctx *acquire_ctx)
{ {
...@@ -240,8 +239,7 @@ v3d_unlock_bo_reservations(struct drm_device *dev, ...@@ -240,8 +239,7 @@ v3d_unlock_bo_reservations(struct drm_device *dev,
* to v3d, so we don't attach dma-buf fences to them. * to v3d, so we don't attach dma-buf fences to them.
*/ */
static int static int
v3d_lock_bo_reservations(struct drm_device *dev, v3d_lock_bo_reservations(struct v3d_bo **bos,
struct v3d_bo **bos,
int bo_count, int bo_count,
struct ww_acquire_ctx *acquire_ctx) struct ww_acquire_ctx *acquire_ctx)
{ {
...@@ -298,7 +296,7 @@ v3d_lock_bo_reservations(struct drm_device *dev, ...@@ -298,7 +296,7 @@ v3d_lock_bo_reservations(struct drm_device *dev,
for (i = 0; i < bo_count; i++) { for (i = 0; i < bo_count; i++) {
ret = reservation_object_reserve_shared(bos[i]->resv, 1); ret = reservation_object_reserve_shared(bos[i]->resv, 1);
if (ret) { if (ret) {
v3d_unlock_bo_reservations(dev, bos, bo_count, v3d_unlock_bo_reservations(bos, bo_count,
acquire_ctx); acquire_ctx);
return ret; return ret;
} }
...@@ -566,7 +564,7 @@ v3d_submit_cl_ioctl(struct drm_device *dev, void *data, ...@@ -566,7 +564,7 @@ v3d_submit_cl_ioctl(struct drm_device *dev, void *data,
if (ret) if (ret)
goto fail; goto fail;
ret = v3d_lock_bo_reservations(dev, exec->bo, exec->bo_count, ret = v3d_lock_bo_reservations(exec->bo, exec->bo_count,
&acquire_ctx); &acquire_ctx);
if (ret) if (ret)
goto fail; goto fail;
...@@ -604,7 +602,7 @@ v3d_submit_cl_ioctl(struct drm_device *dev, void *data, ...@@ -604,7 +602,7 @@ v3d_submit_cl_ioctl(struct drm_device *dev, void *data,
v3d_attach_object_fences(exec->bo, exec->bo_count, v3d_attach_object_fences(exec->bo, exec->bo_count,
exec->render_done_fence); exec->render_done_fence);
v3d_unlock_bo_reservations(dev, exec->bo, exec->bo_count, &acquire_ctx); v3d_unlock_bo_reservations(exec->bo, exec->bo_count, &acquire_ctx);
/* Update the return sync object for the */ /* Update the return sync object for the */
sync_out = drm_syncobj_find(file_priv, args->out_sync); sync_out = drm_syncobj_find(file_priv, args->out_sync);
...@@ -620,7 +618,7 @@ v3d_submit_cl_ioctl(struct drm_device *dev, void *data, ...@@ -620,7 +618,7 @@ v3d_submit_cl_ioctl(struct drm_device *dev, void *data,
fail_unreserve: fail_unreserve:
mutex_unlock(&v3d->sched_lock); mutex_unlock(&v3d->sched_lock);
v3d_unlock_bo_reservations(dev, exec->bo, exec->bo_count, &acquire_ctx); v3d_unlock_bo_reservations(exec->bo, exec->bo_count, &acquire_ctx);
fail: fail:
v3d_exec_put(exec); v3d_exec_put(exec);
...@@ -691,7 +689,7 @@ v3d_submit_tfu_ioctl(struct drm_device *dev, void *data, ...@@ -691,7 +689,7 @@ v3d_submit_tfu_ioctl(struct drm_device *dev, void *data,
} }
spin_unlock(&file_priv->table_lock); spin_unlock(&file_priv->table_lock);
ret = v3d_lock_bo_reservations(dev, job->bo, bo_count, &acquire_ctx); ret = v3d_lock_bo_reservations(job->bo, bo_count, &acquire_ctx);
if (ret) if (ret)
goto fail; goto fail;
...@@ -710,7 +708,7 @@ v3d_submit_tfu_ioctl(struct drm_device *dev, void *data, ...@@ -710,7 +708,7 @@ v3d_submit_tfu_ioctl(struct drm_device *dev, void *data,
v3d_attach_object_fences(job->bo, bo_count, sched_done_fence); v3d_attach_object_fences(job->bo, bo_count, sched_done_fence);
v3d_unlock_bo_reservations(dev, job->bo, bo_count, &acquire_ctx); v3d_unlock_bo_reservations(job->bo, bo_count, &acquire_ctx);
/* Update the return sync object */ /* Update the return sync object */
sync_out = drm_syncobj_find(file_priv, args->out_sync); sync_out = drm_syncobj_find(file_priv, args->out_sync);
...@@ -726,7 +724,7 @@ v3d_submit_tfu_ioctl(struct drm_device *dev, void *data, ...@@ -726,7 +724,7 @@ v3d_submit_tfu_ioctl(struct drm_device *dev, void *data,
fail_unreserve: fail_unreserve:
mutex_unlock(&v3d->sched_lock); mutex_unlock(&v3d->sched_lock);
v3d_unlock_bo_reservations(dev, job->bo, bo_count, &acquire_ctx); v3d_unlock_bo_reservations(job->bo, bo_count, &acquire_ctx);
fail: fail:
v3d_tfu_job_put(job); v3d_tfu_job_put(job);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment