Merge branch 'drm-next-5.2' of git://people.freedesktop.org/~agd5f/linux into drm...

[sfrench/cifs-2.6.git] / drivers / gpu / drm / virtio / virtgpu_ttm.c

diff --git a/drivers/gpu/drm/virtio/virtgpu_ttm.c b/drivers/gpu/drm/virtio/virtgpu_ttm.c
index 4bfbf25fabff8091cab1518f5fc4302a0e4dfd56..300ef3a83538965c0ec0b6e635f69d28be195fd1 100644 (file)
--- a/drivers/gpu/drm/virtio/virtgpu_ttm.c
+++ b/drivers/gpu/drm/virtio/virtgpu_ttm.c
@@ -37,8 +37,6 @@
 
 #include <linux/delay.h>
 
-#define DRM_FILE_PAGE_OFFSET (0x100000000ULL >> PAGE_SHIFT)
-
 static struct
 virtio_gpu_device *virtio_gpu_get_vgdev(struct ttm_bo_device *bdev)
 {
@@ -116,10 +114,6 @@ static const struct ttm_mem_type_manager_func virtio_gpu_bo_manager_func = {
 static int virtio_gpu_init_mem_type(struct ttm_bo_device *bdev, uint32_t type,
                                    struct ttm_mem_type_manager *man)
 {
-       struct virtio_gpu_device *vgdev;
-
-       vgdev = virtio_gpu_get_vgdev(bdev);
-
        switch (type) {
        case TTM_PL_SYSTEM:
                /* System memory */
@@ -194,42 +188,45 @@ static void virtio_gpu_ttm_io_mem_free(struct ttm_bo_device *bdev,
  */
 struct virtio_gpu_ttm_tt {
        struct ttm_dma_tt               ttm;
-       struct virtio_gpu_device        *vgdev;
-       u64                             offset;
+       struct virtio_gpu_object        *obj;
 };
 
-static int virtio_gpu_ttm_backend_bind(struct ttm_tt *ttm,
-                                      struct ttm_mem_reg *bo_mem)
+static int virtio_gpu_ttm_tt_bind(struct ttm_tt *ttm,
+                                 struct ttm_mem_reg *bo_mem)
 {
-       struct virtio_gpu_ttm_tt *gtt = (void *)ttm;
+       struct virtio_gpu_ttm_tt *gtt =
+               container_of(ttm, struct virtio_gpu_ttm_tt, ttm.ttm);
+       struct virtio_gpu_device *vgdev =
+               virtio_gpu_get_vgdev(gtt->obj->tbo.bdev);
 
-       gtt->offset = (unsigned long)(bo_mem->start << PAGE_SHIFT);
-       if (!ttm->num_pages)
-               WARN(1, "nothing to bind %lu pages for mreg %p back %p!\n",
-                    ttm->num_pages, bo_mem, ttm);
-
-       /* Not implemented */
+       virtio_gpu_object_attach(vgdev, gtt->obj, NULL);
        return 0;
 }
 
-static int virtio_gpu_ttm_backend_unbind(struct ttm_tt *ttm)
+static int virtio_gpu_ttm_tt_unbind(struct ttm_tt *ttm)
 {
-       /* Not implemented */
+       struct virtio_gpu_ttm_tt *gtt =
+               container_of(ttm, struct virtio_gpu_ttm_tt, ttm.ttm);
+       struct virtio_gpu_device *vgdev =
+               virtio_gpu_get_vgdev(gtt->obj->tbo.bdev);
+
+       virtio_gpu_object_detach(vgdev, gtt->obj);
        return 0;
 }
 
-static void virtio_gpu_ttm_backend_destroy(struct ttm_tt *ttm)
+static void virtio_gpu_ttm_tt_destroy(struct ttm_tt *ttm)
 {
-       struct virtio_gpu_ttm_tt *gtt = (void *)ttm;
+       struct virtio_gpu_ttm_tt *gtt =
+               container_of(ttm, struct virtio_gpu_ttm_tt, ttm.ttm);
 
        ttm_dma_tt_fini(&gtt->ttm);
        kfree(gtt);
 }
 
-static struct ttm_backend_func virtio_gpu_backend_func = {
-       .bind = &virtio_gpu_ttm_backend_bind,
-       .unbind = &virtio_gpu_ttm_backend_unbind,
-       .destroy = &virtio_gpu_ttm_backend_destroy,
+static struct ttm_backend_func virtio_gpu_tt_func = {
+       .bind = &virtio_gpu_ttm_tt_bind,
+       .unbind = &virtio_gpu_ttm_tt_unbind,
+       .destroy = &virtio_gpu_ttm_tt_destroy,
 };
 
 static struct ttm_tt *virtio_gpu_ttm_tt_create(struct ttm_buffer_object *bo,
@@ -242,8 +239,8 @@ static struct ttm_tt *virtio_gpu_ttm_tt_create(struct ttm_buffer_object *bo,
        gtt = kzalloc(sizeof(struct virtio_gpu_ttm_tt), GFP_KERNEL);
        if (gtt == NULL)
                return NULL;
-       gtt->ttm.ttm.func = &virtio_gpu_backend_func;
-       gtt->vgdev = vgdev;
+       gtt->ttm.ttm.func = &virtio_gpu_tt_func;
+       gtt->obj = container_of(bo, struct virtio_gpu_object, tbo);
        if (ttm_dma_tt_init(&gtt->ttm, bo, page_flags)) {
                kfree(gtt);
                return NULL;
@@ -251,58 +248,11 @@ static struct ttm_tt *virtio_gpu_ttm_tt_create(struct ttm_buffer_object *bo,
        return &gtt->ttm.ttm;
 }
 
-static void virtio_gpu_move_null(struct ttm_buffer_object *bo,
-                                struct ttm_mem_reg *new_mem)
-{
-       struct ttm_mem_reg *old_mem = &bo->mem;
-
-       BUG_ON(old_mem->mm_node != NULL);
-       *old_mem = *new_mem;
-       new_mem->mm_node = NULL;
-}
-
-static int virtio_gpu_bo_move(struct ttm_buffer_object *bo, bool evict,
-                             struct ttm_operation_ctx *ctx,
-                             struct ttm_mem_reg *new_mem)
-{
-       int ret;
-
-       ret = ttm_bo_wait(bo, ctx->interruptible, ctx->no_wait_gpu);
-       if (ret)
-               return ret;
-
-       virtio_gpu_move_null(bo, new_mem);
-       return 0;
-}
-
-static void virtio_gpu_bo_move_notify(struct ttm_buffer_object *tbo,
-                                     bool evict,
-                                     struct ttm_mem_reg *new_mem)
-{
-       struct virtio_gpu_object *bo;
-       struct virtio_gpu_device *vgdev;
-
-       bo = container_of(tbo, struct virtio_gpu_object, tbo);
-       vgdev = (struct virtio_gpu_device *)bo->gem_base.dev->dev_private;
-
-       if (!new_mem || (new_mem->placement & TTM_PL_FLAG_SYSTEM)) {
-               if (bo->hw_res_handle)
-                       virtio_gpu_object_detach(vgdev, bo);
-
-       } else if (new_mem->placement & TTM_PL_FLAG_TT) {
-               if (bo->hw_res_handle) {
-                       virtio_gpu_object_attach(vgdev, bo, NULL);
-               }
-       }
-}
-
 static void virtio_gpu_bo_swap_notify(struct ttm_buffer_object *tbo)
 {
        struct virtio_gpu_object *bo;
-       struct virtio_gpu_device *vgdev;
 
        bo = container_of(tbo, struct virtio_gpu_object, tbo);
-       vgdev = (struct virtio_gpu_device *)bo->gem_base.dev->dev_private;
 
        if (bo->pages)
                virtio_gpu_object_free_sg_table(bo);
@@ -314,11 +264,9 @@ static struct ttm_bo_driver virtio_gpu_bo_driver = {
        .init_mem_type = &virtio_gpu_init_mem_type,
        .eviction_valuable = ttm_bo_eviction_valuable,
        .evict_flags = &virtio_gpu_evict_flags,
-       .move = &virtio_gpu_bo_move,
        .verify_access = &virtio_gpu_verify_access,
        .io_mem_reserve = &virtio_gpu_ttm_io_mem_reserve,
        .io_mem_free = &virtio_gpu_ttm_io_mem_free,
-       .move_notify = &virtio_gpu_bo_move_notify,
        .swap_notify = &virtio_gpu_bo_swap_notify,
 };
 
@@ -330,7 +278,7 @@ int virtio_gpu_ttm_init(struct virtio_gpu_device *vgdev)
        r = ttm_bo_device_init(&vgdev->mman.bdev,
                               &virtio_gpu_bo_driver,
                               vgdev->ddev->anon_inode->i_mapping,
-                              DRM_FILE_PAGE_OFFSET, 0);
+                              false);
        if (r) {
                DRM_ERROR("failed initializing buffer object driver(%d).\n", r);
                goto err_dev_init;