diff options
| author | Christian König <[email protected]> | 2019-07-31 07:41:50 +0000 |
|---|---|---|
| committer | Christian König <[email protected]> | 2019-08-05 07:28:43 +0000 |
| commit | 0dbd555a011c2d096a7b7e40c83c5776a7df367c (patch) | |
| tree | 4399a2204760664daad1c91896aa3f8217744d43 /drivers/gpu/drm/ttm/ttm_execbuf_util.c | |
| parent | drm/vblank: drop use of DRM_WAIT_ON() (diff) | |
| download | kernel-0dbd555a011c2d096a7b7e40c83c5776a7df367c.tar.gz kernel-0dbd555a011c2d096a7b7e40c83c5776a7df367c.zip | |
dma-buf: add more reservation object locking wrappers
Complete the abstraction of the ww_mutex inside the reservation object.
This allows us to add more handling and debugging to the reservation
object in the future.
Signed-off-by: Christian König <[email protected]>
Reviewed-by: Chris Wilson <[email protected]>
Link: https://patchwork.freedesktop.org/patch/320761/
Diffstat (limited to 'drivers/gpu/drm/ttm/ttm_execbuf_util.c')
| -rw-r--r-- | drivers/gpu/drm/ttm/ttm_execbuf_util.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_execbuf_util.c b/drivers/gpu/drm/ttm/ttm_execbuf_util.c index 957ec375a4ba..723fb583fdda 100644 --- a/drivers/gpu/drm/ttm/ttm_execbuf_util.c +++ b/drivers/gpu/drm/ttm/ttm_execbuf_util.c @@ -144,10 +144,10 @@ int ttm_eu_reserve_buffers(struct ww_acquire_ctx *ticket, if (ret == -EDEADLK) { if (intr) { - ret = ww_mutex_lock_slow_interruptible(&bo->resv->lock, - ticket); + ret = reservation_object_lock_slow_interruptible(bo->resv, + ticket); } else { - ww_mutex_lock_slow(&bo->resv->lock, ticket); + reservation_object_lock_slow(bo->resv, ticket); ret = 0; } } |