Am 05.09.19 um 09:05 schrieb Gerd Hoffmann:
> No users left. Drivers either setup vma_offset_manager themself
> (vmwgfx) or pass the gem vma_offset_manager to ttm_bo_device_init
> (all other drivers).
>
> Signed-off-by: Gerd Hoffmann <kraxel@xxxxxxxxxx>
Patches #4, #5 and #8 in this series are Reviewed-by: Christian König
<christian.koenig@xxxxxxx>
I can't see the rest in my inbox anywhere. Have you send all of them to
dri-devel?
Christian.
> ---
> include/drm/ttm/ttm_bo_driver.h | 4 +---
> drivers/gpu/drm/ttm/ttm_bo.c | 9 ++-------
> 2 files changed, 3 insertions(+), 10 deletions(-)
>
> diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h
> index e365434f92b3..4e307f65f497 100644
> --- a/include/drm/ttm/ttm_bo_driver.h
> +++ b/include/drm/ttm/ttm_bo_driver.h
> @@ -442,7 +442,6 @@ extern struct ttm_bo_global {
> * @driver: Pointer to a struct ttm_bo_driver struct setup by the driver.
> * @man: An array of mem_type_managers.
> * @vma_manager: Address space manager (pointer)
> - * @_vma_manager: Address space manager (enbedded)
> * lru_lock: Spinlock that protects the buffer+device lru lists and
> * ddestroy lists.
> * @dev_mapping: A pointer to the struct address_space representing the
> @@ -466,7 +465,6 @@ struct ttm_bo_device {
> * Protected by internal locks.
> */
> struct drm_vma_offset_manager *vma_manager;
> - struct drm_vma_offset_manager _vma_manager;
>
> /*
> * Protected by the global:lru lock.
> @@ -587,7 +585,7 @@ int ttm_bo_device_release(struct ttm_bo_device *bdev);
> * @glob: A pointer to an initialized struct ttm_bo_global.
> * @driver: A pointer to a struct ttm_bo_driver set up by the caller.
> * @mapping: The address space to use for this bo.
> - * @vma_manager: A pointer to a vma manager or NULL.
> + * @vma_manager: A pointer to a vma manager.
> * @file_page_offset: Offset into the device address space that is available
> * for buffer data. This ensures compatibility with other users of the
> * address space.
> diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
> index 8dc26babc5cb..881cf26d698e 100644
> --- a/drivers/gpu/drm/ttm/ttm_bo.c
> +++ b/drivers/gpu/drm/ttm/ttm_bo.c
> @@ -1704,8 +1704,6 @@ int ttm_bo_device_release(struct ttm_bo_device *bdev)
> pr_debug("Swap list %d was clean\n", i);
> spin_unlock(&glob->lru_lock);
>
> - drm_vma_offset_manager_destroy(&bdev->_vma_manager);
> -
> if (!ret)
> ttm_bo_global_release();
>
> @@ -1722,8 +1720,8 @@ int ttm_bo_device_init(struct ttm_bo_device *bdev,
> struct ttm_bo_global *glob = &ttm_bo_glob;
> int ret;
>
> - if (!vma_manager)
> - vma_manager = &bdev->_vma_manager;
> + if (WARN_ON(vma_manager == NULL))
> + return -EINVAL;
>
> ret = ttm_bo_global_init();
> if (ret)
> @@ -1742,9 +1740,6 @@ int ttm_bo_device_init(struct ttm_bo_device *bdev,
> goto out_no_sys;
>
> bdev->vma_manager = vma_manager;
> - drm_vma_offset_manager_init(&bdev->_vma_manager,
> - DRM_FILE_PAGE_OFFSET_START,
> - DRM_FILE_PAGE_OFFSET_SIZE);
> INIT_DELAYED_WORK(&bdev->wq, ttm_bo_delayed_workqueue);
> INIT_LIST_HEAD(&bdev->ddestroy);
> bdev->dev_mapping = mapping;
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
