drm/virtio: pass gem reservation object to ttm init

With this gem and ttm will use the same reservation object,
so mixing and matching ttm / gem reservation helpers should
work fine.

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-2-kraxel@redhat.com

diff --git a/drivers/gpu/drm/virtio/virtgpu_object.c b/drivers/gpu/drm/virtio/virtgpu_object.c
index ab33b65167f696b0311e43dd7aa69774fdd72852..eb4d42f9d1d3e65f107ca7732a172ef4c789c258 100644 (file)
--- a/drivers/gpu/drm/virtio/virtgpu_object.c
+++ b/drivers/gpu/drm/virtio/virtgpu_object.c
@@ -138,7 +138,8 @@ int virtio_gpu_object_create(struct virtio_gpu_device *vgdev,
        virtio_gpu_init_ttm_placement(bo);
        ret = ttm_bo_init(&vgdev->mman.bdev, &bo->tbo, params->size,
                          ttm_bo_type_device, &bo->placement, 0,
-                         true, acc_size, NULL, NULL,
+                         true, acc_size, NULL,
+                         bo->gem_base.resv,
                          &virtio_gpu_ttm_bo_destroy);
        /* ttm_bo_init failure will call the destroy */
        if (ret != 0)