drm/virtio: remove ttm calls from in virtio_gpu_object_{reserve, unreserve}

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

diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.h b/drivers/gpu/drm/virtio/virtgpu_drv.h
index d886c0e3502aa3359c687d015fd829732e643a74..db57bbb362160e61658b7c03e5c119e53a0bc7a1 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 != -ERESTARTSYS) {
+               if (r != -EINTR) {
                        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 */