diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-06-04 13:33:12 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-06-04 13:33:12 -0700 |
| commit | c13aca79ff3c4af5fd31a5b2743a90eba6e36a26 (patch) | |
| tree | 8f77894f61822d1ae5285c07c801af7c62f71afd /drivers/gpu/drm/virtio/virtgpu_object.c | |
| parent | 40f7090bb1b4ec327ea1e1402ff5783af5b35195 (diff) | |
| parent | 5ca4d1ae9bad0f59bd6f851c39b19f5366953666 (diff) | |
Merge branch 'next' into for-linus
Prepare input updates for 4.18 merge window.
Diffstat (limited to 'drivers/gpu/drm/virtio/virtgpu_object.c')
| -rw-r--r-- | drivers/gpu/drm/virtio/virtgpu_object.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/virtio/virtgpu_object.c b/drivers/gpu/drm/virtio/virtgpu_object.c index 0b90cdb3d9fe..9f2f470efd9b 100644 --- a/drivers/gpu/drm/virtio/virtgpu_object.c +++ b/drivers/gpu/drm/virtio/virtgpu_object.c @@ -89,7 +89,7 @@ int virtio_gpu_object_create(struct virtio_gpu_device *vgdev, virtio_gpu_init_ttm_placement(bo, pinned); ret = ttm_bo_init(&vgdev->mman.bdev, &bo->tbo, size, type, - &bo->placement, 0, !kernel, NULL, acc_size, + &bo->placement, 0, !kernel, acc_size, NULL, NULL, &virtio_gpu_ttm_bo_destroy); /* ttm_bo_init failure will call the destroy */ if (ret != 0) |