1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
|
From 0bb404fbd28594eaa21a180d175a64e85c94b01c Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Wed, 28 Nov 2018 15:09:26 -0800
Subject: [PATCH 564/782] 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: Eric Anholt <eric@anholt.net>
Cc: Dave Emett <david.emett@broadcom.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181128230927.10951-2-eric@anholt.net
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
(cherry picked from commit e14a07fc4b961a75f6c275d6bd670ba54fbdae14)
---
drivers/gpu/drm/v3d/v3d_gem.c | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
--- a/drivers/gpu/drm/v3d/v3d_gem.c
+++ b/drivers/gpu/drm/v3d/v3d_gem.c
@@ -219,8 +219,7 @@ v3d_attach_object_fences(struct v3d_bo *
}
static void
-v3d_unlock_bo_reservations(struct drm_device *dev,
- struct v3d_bo **bos,
+v3d_unlock_bo_reservations(struct v3d_bo **bos,
int bo_count,
struct ww_acquire_ctx *acquire_ctx)
{
@@ -240,8 +239,7 @@ v3d_unlock_bo_reservations(struct drm_de
* to v3d, so we don't attach dma-buf fences to them.
*/
static int
-v3d_lock_bo_reservations(struct drm_device *dev,
- struct v3d_bo **bos,
+v3d_lock_bo_reservations(struct v3d_bo **bos,
int bo_count,
struct ww_acquire_ctx *acquire_ctx)
{
@@ -298,7 +296,7 @@ retry:
for (i = 0; i < bo_count; i++) {
ret = reservation_object_reserve_shared(bos[i]->resv);
if (ret) {
- v3d_unlock_bo_reservations(dev, bos, bo_count,
+ v3d_unlock_bo_reservations(bos, bo_count,
acquire_ctx);
return ret;
}
@@ -566,7 +564,7 @@ v3d_submit_cl_ioctl(struct drm_device *d
if (ret)
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);
if (ret)
goto fail;
@@ -604,7 +602,7 @@ v3d_submit_cl_ioctl(struct drm_device *d
v3d_attach_object_fences(exec->bo, exec->bo_count,
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 */
sync_out = drm_syncobj_find(file_priv, args->out_sync);
@@ -620,7 +618,7 @@ v3d_submit_cl_ioctl(struct drm_device *d
fail_unreserve:
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:
v3d_exec_put(exec);
@@ -691,7 +689,7 @@ v3d_submit_tfu_ioctl(struct drm_device *
}
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)
goto fail;
@@ -710,7 +708,7 @@ v3d_submit_tfu_ioctl(struct drm_device *
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 */
sync_out = drm_syncobj_find(file_priv, args->out_sync);
@@ -726,7 +724,7 @@ v3d_submit_tfu_ioctl(struct drm_device *
fail_unreserve:
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:
v3d_tfu_job_put(job);
|
