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

drm/ttm: merge ttm_dma_tt back into ttm_tt 



It makes no difference to kmalloc if the structure
is 48 or 64 bytes in size.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarDave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/396950/
parent 230c079f

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

+3 −7
Original line number Diff line number Diff line
@@ -45,12 +45,10 @@ void amdgpu_gmc_get_pde_for_bo(struct amdgpu_bo *bo, int level, 
			       uint64_t *addr, uint64_t *flags)

{

	struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev);

	struct ttm_dma_tt *ttm;



	switch (bo->tbo.mem.mem_type) {

	case TTM_PL_TT:

		ttm = container_of(bo->tbo.ttm, struct ttm_dma_tt, ttm);

		*addr = ttm->dma_address[0];

		*addr = bo->tbo.ttm->dma_address[0];

		break;

	case TTM_PL_VRAM:

		*addr = amdgpu_bo_gpu_offset(bo);
@@ -122,16 +120,14 @@ int amdgpu_gmc_set_pte_pde(struct amdgpu_device *adev, void *cpu_pt_addr, 
uint64_t amdgpu_gmc_agp_addr(struct ttm_buffer_object *bo)

{

	struct amdgpu_device *adev = amdgpu_ttm_adev(bo->bdev);

	struct ttm_dma_tt *ttm;



	if (bo->num_pages != 1 || bo->ttm->caching == ttm_cached)

		return AMDGPU_BO_INVALID_OFFSET;



	ttm = container_of(bo->ttm, struct ttm_dma_tt, ttm);

	if (ttm->dma_address[0] + PAGE_SIZE >= adev->gmc.agp_size)

	if (bo->ttm->dma_address[0] + PAGE_SIZE >= adev->gmc.agp_size)

		return AMDGPU_BO_INVALID_OFFSET;



	return adev->gmc.agp_start + ttm->dma_address[0];

	return adev->gmc.agp_start + bo->ttm->dma_address[0];

}



/**

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

+6 −8
Original line number Diff line number Diff line
@@ -294,11 +294,9 @@ static int amdgpu_ttm_map_buffer(struct ttm_buffer_object *bo, 
	cpu_addr = &job->ibs[0].ptr[num_dw];



	if (mem->mem_type == TTM_PL_TT) {

		struct ttm_dma_tt *dma;

		dma_addr_t *dma_address;



		dma = container_of(bo->ttm, struct ttm_dma_tt, ttm);

		dma_address = &dma->dma_address[offset >> PAGE_SHIFT];

		dma_address = &bo->ttm->dma_address[offset >> PAGE_SHIFT];

		r = amdgpu_gart_map(adev, 0, num_pages, dma_address, flags,

				    cpu_addr);

		if (r)
@@ -841,7 +839,7 @@ uint64_t amdgpu_ttm_domain_start(struct amdgpu_device *adev, uint32_t type) 
 * TTM backend functions.

 */

struct amdgpu_ttm_tt {

	struct ttm_dma_tt	ttm;

	struct ttm_tt	ttm;

	struct drm_gem_object	*gobj;

	u64			offset;

	uint64_t		userptr;
@@ -1292,7 +1290,7 @@ static void amdgpu_ttm_backend_unbind(struct ttm_bo_device *bdev, 
	r = amdgpu_gart_unbind(adev, gtt->offset, ttm->num_pages);

	if (r)

		DRM_ERROR("failed to unbind %u pages at 0x%08llX\n",

			  gtt->ttm.ttm.num_pages, gtt->offset);

			  gtt->ttm.num_pages, gtt->offset);

	gtt->bound = false;

}
@@ -1306,7 +1304,7 @@ static void amdgpu_ttm_backend_destroy(struct ttm_bo_device *bdev, 
	if (gtt->usertask)

		put_task_struct(gtt->usertask);



	ttm_dma_tt_fini(&gtt->ttm);

	ttm_tt_fini(&gtt->ttm);

	kfree(gtt);

}
@@ -1340,7 +1338,7 @@ static struct ttm_tt *amdgpu_ttm_tt_create(struct ttm_buffer_object *bo, 
		kfree(gtt);

		return NULL;

	}

	return &gtt->ttm.ttm;

	return &gtt->ttm;

}



/**
@@ -1507,7 +1505,7 @@ bool amdgpu_ttm_tt_affect_userptr(struct ttm_tt *ttm, unsigned long start, 
	/* Return false if no part of the ttm_tt object lies within

	 * the range

	 */

	size = (unsigned long)gtt->ttm.ttm.num_pages * PAGE_SIZE;

	size = (unsigned long)gtt->ttm.num_pages * PAGE_SIZE;

	if (gtt->userptr > end || gtt->userptr + size <= start)

		return false;

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

+2 −5
Original line number Diff line number Diff line
@@ -1781,7 +1781,6 @@ int amdgpu_vm_bo_update(struct amdgpu_device *adev, struct amdgpu_bo_va *bo_va, 
		resv = vm->root.base.bo->tbo.base.resv;

	} else {

		struct drm_gem_object *obj = &bo->tbo.base;

		struct ttm_dma_tt *ttm;



		resv = bo->tbo.base.resv;

		if (obj->import_attach && bo_va->is_xgmi) {
@@ -1794,10 +1793,8 @@ int amdgpu_vm_bo_update(struct amdgpu_device *adev, struct amdgpu_bo_va *bo_va, 
		}

		mem = &bo->tbo.mem;

		nodes = mem->mm_node;

		if (mem->mem_type == TTM_PL_TT) {

			ttm = container_of(bo->tbo.ttm, struct ttm_dma_tt, ttm);

			pages_addr = ttm->dma_address;

		}

		if (mem->mem_type == TTM_PL_TT)

			pages_addr = bo->tbo.ttm->dma_address;

	}



	if (bo) {

drivers/gpu/drm/nouveau/nouveau_bo.c

+6 −6
Original line number Diff line number Diff line
@@ -547,7 +547,7 @@ void 
nouveau_bo_sync_for_device(struct nouveau_bo *nvbo)

{

	struct nouveau_drm *drm = nouveau_bdev(nvbo->bo.bdev);

	struct ttm_dma_tt *ttm_dma = (struct ttm_dma_tt *)nvbo->bo.ttm;

	struct ttm_tt *ttm_dma = (struct ttm_tt *)nvbo->bo.ttm;

	int i;



	if (!ttm_dma)
@@ -557,7 +557,7 @@ nouveau_bo_sync_for_device(struct nouveau_bo *nvbo) 
	if (nvbo->force_coherent)

		return;



	for (i = 0; i < ttm_dma->ttm.num_pages; i++)

	for (i = 0; i < ttm_dma->num_pages; i++)

		dma_sync_single_for_device(drm->dev->dev,

					   ttm_dma->dma_address[i],

					   PAGE_SIZE, DMA_TO_DEVICE);
@@ -567,7 +567,7 @@ void 
nouveau_bo_sync_for_cpu(struct nouveau_bo *nvbo)

{

	struct nouveau_drm *drm = nouveau_bdev(nvbo->bo.bdev);

	struct ttm_dma_tt *ttm_dma = (struct ttm_dma_tt *)nvbo->bo.ttm;

	struct ttm_tt *ttm_dma = (struct ttm_tt *)nvbo->bo.ttm;

	int i;



	if (!ttm_dma)
@@ -577,7 +577,7 @@ nouveau_bo_sync_for_cpu(struct nouveau_bo *nvbo) 
	if (nvbo->force_coherent)

		return;



	for (i = 0; i < ttm_dma->ttm.num_pages; i++)

	for (i = 0; i < ttm_dma->num_pages; i++)

		dma_sync_single_for_cpu(drm->dev->dev, ttm_dma->dma_address[i],

					PAGE_SIZE, DMA_FROM_DEVICE);

}
@@ -1309,7 +1309,7 @@ static int 
nouveau_ttm_tt_populate(struct ttm_bo_device *bdev,

			struct ttm_tt *ttm, struct ttm_operation_ctx *ctx)

{

	struct ttm_dma_tt *ttm_dma = (void *)ttm;

	struct ttm_tt *ttm_dma = (void *)ttm;

	struct nouveau_drm *drm;

	struct device *dev;

	bool slave = !!(ttm->page_flags & TTM_PAGE_FLAG_SG);
@@ -1345,7 +1345,7 @@ static void 
nouveau_ttm_tt_unpopulate(struct ttm_bo_device *bdev,

			  struct ttm_tt *ttm)

{

	struct ttm_dma_tt *ttm_dma = (void *)ttm;

	struct ttm_tt *ttm_dma = (void *)ttm;

	struct nouveau_drm *drm;

	struct device *dev;

	bool slave = !!(ttm->page_flags & TTM_PAGE_FLAG_SG);

drivers/gpu/drm/nouveau/nouveau_mem.c

+5 −3
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ nouveau_mem_fini(struct nouveau_mem *mem) 
}



int

nouveau_mem_host(struct ttm_resource *reg, struct ttm_dma_tt *tt)

nouveau_mem_host(struct ttm_resource *reg, struct ttm_tt *tt)

{

	struct nouveau_mem *mem = nouveau_mem(reg);

	struct nouveau_cli *cli = mem->cli;
@@ -116,8 +116,10 @@ nouveau_mem_host(struct ttm_resource *reg, struct ttm_dma_tt *tt) 
		mem->comp = 0;

	}



	if (tt->ttm.sg) args.sgl = tt->ttm.sg->sgl;

	else            args.dma = tt->dma_address;

	if (tt->sg)

		args.sgl = tt->sg->sgl;

	else

		args.dma = tt->dma_address;



	mutex_lock(&drm->master.lock);

	cli->base.super = true;

CRA Git | Maintained and supported by SUSTech CRA and CCSE