Commit 9d6f4484 authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

drm/ttm: turn ttm_bo_device.vma_manager into a pointer 



Rename the embedded struct vma_offset_manager, new name is _vma_manager.
ttm_bo_device.vma_manager changed to a pointer.

The ttm_bo_device_init() function gets an additional vma_manager
argument which allows to initialize ttm with a different vma manager.
When passing NULL the embedded _vma_manager is used.

All callers are updated to pass NULL, so the behavior doesn't change.

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20190905070509.22407-2-kraxel@redhat.com
parent 4f7f1973

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c

+1 −0
Original line number Diff line number Diff line
@@ -1728,6 +1728,7 @@ int amdgpu_ttm_init(struct amdgpu_device *adev) 
	r = ttm_bo_device_init(&adev->mman.bdev,

			       &amdgpu_bo_driver,

			       adev->ddev->anon_inode->i_mapping,

			       NULL,

			       adev->need_dma32);

	if (r) {

		DRM_ERROR("failed initializing buffer object driver(%d).\n", r);

drivers/gpu/drm/drm_vram_mm_helper.c

+1 −0
Original line number Diff line number Diff line
@@ -228,6 +228,7 @@ int drm_vram_mm_init(struct drm_vram_mm *vmm, struct drm_device *dev, 


	ret = ttm_bo_device_init(&vmm->bdev, &bo_driver,

				 dev->anon_inode->i_mapping,

				 NULL,

				 true);

	if (ret)

		return ret;

drivers/gpu/drm/nouveau/nouveau_ttm.c

+1 −0
Original line number Diff line number Diff line
@@ -236,6 +236,7 @@ nouveau_ttm_init(struct nouveau_drm *drm) 
	ret = ttm_bo_device_init(&drm->ttm.bdev,

				  &nouveau_bo_driver,

				  dev->anon_inode->i_mapping,

				 NULL,

				  drm->client.mmu.dmabits <= 32 ? true : false);

	if (ret) {

		NV_ERROR(drm, "error initialising bo driver, %d\n", ret);

drivers/gpu/drm/qxl/qxl_ttm.c

+1 −0
Original line number Diff line number Diff line
@@ -325,6 +325,7 @@ int qxl_ttm_init(struct qxl_device *qdev) 
	r = ttm_bo_device_init(&qdev->mman.bdev,

			       &qxl_bo_driver,

			       qdev->ddev.anon_inode->i_mapping,

			       NULL,

			       false);

	if (r) {

		DRM_ERROR("failed initializing buffer object driver(%d).\n", r);

drivers/gpu/drm/radeon/radeon_ttm.c

+1 −0
Original line number Diff line number Diff line
@@ -794,6 +794,7 @@ int radeon_ttm_init(struct radeon_device *rdev) 
	r = ttm_bo_device_init(&rdev->mman.bdev,

			       &radeon_bo_driver,

			       rdev->ddev->anon_inode->i_mapping,

			       NULL,

			       rdev->need_dma32);

	if (r) {

		DRM_ERROR("failed initializing buffer object driver(%d).\n", r);

CRA Git | Maintained and supported by SUSTech CRA and CCSE