drm/virtio: switch driver from bo->resv to bo->base.resv

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Acked-by: Christian König <christian.koenig@amd.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20190805140119.7337-17-kraxel@redhat.com

diff --git a/drivers/gpu/drm/virtio/virtgpu_ioctl.c b/drivers/gpu/drm/virtio/virtgpu_ioctl.c
index d379d2e7e3ef9375b452d8e8fecbc52181194c66..3c430dd65f67123ed6470397a962379e08e4a3fd 100644 (file)
--- a/drivers/gpu/drm/virtio/virtgpu_ioctl.c
+++ b/drivers/gpu/drm/virtio/virtgpu_ioctl.c
@@ -396,7 +396,7 @@ static int virtio_gpu_transfer_from_host_ioctl(struct drm_device *dev,
                (vgdev, qobj->hw_res_handle,
                 vfpriv->ctx_id, offset, args->level,
                 &box, fence);
-       reservation_object_add_excl_fence(qobj->tbo.resv,
+       reservation_object_add_excl_fence(qobj->tbo.base.resv,
                                          &fence->f);
 
        dma_fence_put(&fence->f);
@@ -450,7 +450,7 @@ static int virtio_gpu_transfer_to_host_ioctl(struct drm_device *dev, void *data,
                        (vgdev, qobj,
                         vfpriv ? vfpriv->ctx_id : 0, offset,
                         args->level, &box, fence);
-               reservation_object_add_excl_fence(qobj->tbo.resv,
+               reservation_object_add_excl_fence(qobj->tbo.base.resv,
                                                  &fence->f);
                dma_fence_put(&fence->f);
        }

diff --git a/drivers/gpu/drm/virtio/virtgpu_plane.c b/drivers/gpu/drm/virtio/virtgpu_plane.c
index f96c8296307ed009e642b499e2300ba39ffc189d..3dc08f991a8df3ded73811f9eec126fab621081a 100644 (file)
--- a/drivers/gpu/drm/virtio/virtgpu_plane.c
+++ b/drivers/gpu/drm/virtio/virtgpu_plane.c
@@ -212,7 +212,7 @@ static void virtio_gpu_cursor_plane_update(struct drm_plane *plane,
                         0, 0, vgfb->fence);
                ret = virtio_gpu_object_reserve(bo, false);
                if (!ret) {
-                       reservation_object_add_excl_fence(bo->tbo.resv,
+                       reservation_object_add_excl_fence(bo->tbo.base.resv,
                                                          &vgfb->fence->f);
                        dma_fence_put(&vgfb->fence->f);
                        vgfb->fence = NULL;