projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszer...
[cascardo/linux.git]
/
drivers
/
gpu
/
drm
/
virtio
/
virtgpu_object.c
diff --git
a/drivers/gpu/drm/virtio/virtgpu_object.c
b/drivers/gpu/drm/virtio/virtgpu_object.c
index
f300eba
..
1483dae
100644
(file)
--- a/
drivers/gpu/drm/virtio/virtgpu_object.c
+++ b/
drivers/gpu/drm/virtio/virtgpu_object.c
@@
-155,10
+155,10
@@
int virtio_gpu_object_wait(struct virtio_gpu_object *bo, bool no_wait)
{
int r;
{
int r;
- r = ttm_bo_reserve(&bo->tbo, true, no_wait,
false,
NULL);
+ r = ttm_bo_reserve(&bo->tbo, true, no_wait, NULL);
if (unlikely(r != 0))
return r;
if (unlikely(r != 0))
return r;
- r = ttm_bo_wait(&bo->tbo, true,
true,
no_wait);
+ r = ttm_bo_wait(&bo->tbo, true, no_wait);
ttm_bo_unreserve(&bo->tbo);
return r;
}
ttm_bo_unreserve(&bo->tbo);
return r;
}