OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
23a0e88
)
drm/virtio: remove ttm calls from in virtio_gpu_object_{reserve, unreserve}
author
Gerd Hoffmann
<kraxel@redhat.com>
Thu, 29 Aug 2019 10:32:49 +0000
(12:32 +0200)
committer
Gerd Hoffmann
<kraxel@redhat.com>
Wed, 4 Sep 2019 04:54:09 +0000
(06:54 +0200)
Call reservation_object_* directly instead
of using ttm_bo_{reserve,unreserve}.
v4: check for EINTR only.
v3: check for EINTR too.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Chia-I Wu <olvaffe@gmail.com>
Link:
http://patchwork.freedesktop.org/patch/msgid/20190829103301.3539-7-kraxel@redhat.com
drivers/gpu/drm/virtio/virtgpu_drv.h
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/virtio/virtgpu_drv.h
b/drivers/gpu/drm/virtio/virtgpu_drv.h
index
d886c0e
..
db57bbb
100644
(file)
--- a/
drivers/gpu/drm/virtio/virtgpu_drv.h
+++ b/
drivers/gpu/drm/virtio/virtgpu_drv.h
@@
-402,9
+402,9
@@
static inline int virtio_gpu_object_reserve(struct virtio_gpu_object *bo)
{
int r;
- r =
ttm_bo_reserve(&bo->tbo, true, false
, NULL);
+ r =
dma_resv_lock_interruptible(bo->gem_base.resv
, NULL);
if (unlikely(r != 0)) {
- if (r != -E
RESTARTSYS
) {
+ if (r != -E
INTR
) {
struct virtio_gpu_device *qdev =
bo->gem_base.dev->dev_private;
dev_err(qdev->dev, "%p reserve failed\n", bo);
@@
-416,7
+416,7
@@
static inline int virtio_gpu_object_reserve(struct virtio_gpu_object *bo)
static inline void virtio_gpu_object_unreserve(struct virtio_gpu_object *bo)
{
-
ttm_bo_unreserve(&bo->tbo
);
+
dma_resv_unlock(bo->gem_base.resv
);
}
/* virgl debufs */