Commit ee5d2a8e authored by Christian König's avatar Christian König
Browse files

drm/ttm: wire up the new pool as default one v2 



Provide the necessary parameters by all drivers and use the new pool alloc
when no driver specific function is provided.

v2: fix the GEM VRAM helpers

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarDave Airlie <airlied@redhat.com>
Reviewed-by: default avatarMadhav Chauhan <madhav.chauhan@amd.com>
Tested-by: default avatarHuang Rui <ray.huang@amd.com>
Link: https://patchwork.freedesktop.org/patch/397081/?series=83051&rev=1
parent d099fc8f

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

+2 −2
Original line number Diff line number Diff line
@@ -1914,10 +1914,10 @@ int amdgpu_ttm_init(struct amdgpu_device *adev) 
	mutex_init(&adev->mman.gtt_window_lock);



	/* No others user of address space so set it to 0 */

	r = ttm_bo_device_init(&adev->mman.bdev,

			       &amdgpu_bo_driver,

	r = ttm_bo_device_init(&adev->mman.bdev, &amdgpu_bo_driver, adev->dev,

			       adev_to_drm(adev)->anon_inode->i_mapping,

			       adev_to_drm(adev)->vma_offset_manager,

			       adev->need_swiotlb,

			       dma_addressing_limited(adev->dev));

	if (r) {

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

drivers/gpu/drm/drm_gem_vram_helper.c

+2 −2
Original line number Diff line number Diff line
@@ -1045,10 +1045,10 @@ static int drm_vram_mm_init(struct drm_vram_mm *vmm, struct drm_device *dev, 
	vmm->vram_base = vram_base;

	vmm->vram_size = vram_size;



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

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

				 dev->anon_inode->i_mapping,

				 dev->vma_offset_manager,

				 true);

				 false, true);

	if (ret)

		return ret;

drivers/gpu/drm/nouveau/nouveau_ttm.c

+9 −5
Original line number Diff line number Diff line
@@ -281,6 +281,7 @@ nouveau_ttm_init(struct nouveau_drm *drm) 
	struct nvkm_pci *pci = device->pci;

	struct nvif_mmu *mmu = &drm->client.mmu;

	struct drm_device *dev = drm->dev;

	bool need_swiotlb = false;

	int typei, ret;



	ret = nouveau_ttm_init_host(drm, 0);
@@ -315,11 +316,14 @@ nouveau_ttm_init(struct nouveau_drm *drm) 
		drm->agp.cma = pci->agp.cma;

	}



	ret = ttm_bo_device_init(&drm->ttm.bdev,

				  &nouveau_bo_driver,

				  dev->anon_inode->i_mapping,

				  dev->vma_offset_manager,

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

#if IS_ENABLED(CONFIG_SWIOTLB) && IS_ENABLED(CONFIG_X86)

	need_swiotlb = !!swiotlb_nr_tbl();

#endif



	ret = ttm_bo_device_init(&drm->ttm.bdev, &nouveau_bo_driver,

				 drm->dev->dev, dev->anon_inode->i_mapping,

				 dev->vma_offset_manager, need_swiotlb,

				 drm->client.mmu.dmabits <= 32);

	if (ret) {

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

		return ret;

drivers/gpu/drm/qxl/qxl_ttm.c

+2 −3
Original line number Diff line number Diff line
@@ -194,11 +194,10 @@ int qxl_ttm_init(struct qxl_device *qdev) 
	int num_io_pages; /* != rom->num_io_pages, we include surface0 */



	/* No others user of address space so set it to 0 */

	r = ttm_bo_device_init(&qdev->mman.bdev,

			       &qxl_bo_driver,

	r = ttm_bo_device_init(&qdev->mman.bdev, &qxl_bo_driver, NULL,

			       qdev->ddev.anon_inode->i_mapping,

			       qdev->ddev.vma_offset_manager,

			       false);

			       false, false);

	if (r) {

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

		return r;

drivers/gpu/drm/radeon/radeon_ttm.c

+2 −2
Original line number Diff line number Diff line
@@ -846,10 +846,10 @@ int radeon_ttm_init(struct radeon_device *rdev) 
	int r;



	/* No others user of address space so set it to 0 */

	r = ttm_bo_device_init(&rdev->mman.bdev,

			       &radeon_bo_driver,

	r = ttm_bo_device_init(&rdev->mman.bdev, &radeon_bo_driver, rdev->dev,

			       rdev->ddev->anon_inode->i_mapping,

			       rdev->ddev->vma_offset_manager,

			       rdev->need_swiotlb,

			       dma_addressing_limited(&rdev->pdev->dev));

	if (r) {

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE