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

drm/ttm: rename bo->mem and make it a pointer 



When we want to decouble resource management from buffer management we need to
be able to handle resources separately.

Add a resource pointer and rename bo->mem so that all code needs to
change to access the pointer instead.

No functional change.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarMatthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210430092508.60710-4-christian.koenig@amd.com
parent 9450129e

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

+1 −1
Original line number Diff line number Diff line
@@ -1666,7 +1666,7 @@ int amdgpu_amdkfd_gpuvm_map_memory_to_gpu( 
	 * the next restore worker

	 */

	if (amdgpu_ttm_tt_get_usermm(bo->tbo.ttm) &&

	    bo->tbo.mem.mem_type == TTM_PL_SYSTEM)

	    bo->tbo.resource->mem_type == TTM_PL_SYSTEM)

		is_invalid_userptr = true;



	ret = vm_validate_pt_pd_bos(avm);

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

+3 −3
Original line number Diff line number Diff line
@@ -4103,9 +4103,9 @@ static int amdgpu_device_recover_vram(struct amdgpu_device *adev) 
	list_for_each_entry(shadow, &adev->shadow_list, shadow_list) {



		/* No need to recover an evicted BO */

		if (shadow->tbo.mem.mem_type != TTM_PL_TT ||

		    shadow->tbo.mem.start == AMDGPU_BO_INVALID_OFFSET ||

		    shadow->parent->tbo.mem.mem_type != TTM_PL_VRAM)

		if (shadow->tbo.resource->mem_type != TTM_PL_TT ||

		    shadow->tbo.resource->start == AMDGPU_BO_INVALID_OFFSET ||

		    shadow->parent->tbo.resource->mem_type != TTM_PL_VRAM)

			continue;



		r = amdgpu_bo_restore_shadow(shadow, &next);

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

+6 −5
Original line number Diff line number Diff line
@@ -226,12 +226,12 @@ static struct sg_table *amdgpu_dma_buf_map(struct dma_buf_attachment *attach, 
		if (r)

			return ERR_PTR(r);



	} else if (!(amdgpu_mem_type_to_domain(bo->tbo.mem.mem_type) &

	} else if (!(amdgpu_mem_type_to_domain(bo->tbo.resource->mem_type) &

		     AMDGPU_GEM_DOMAIN_GTT)) {

		return ERR_PTR(-EBUSY);

	}



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

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

	case TTM_PL_TT:

		sgt = drm_prime_pages_to_sg(obj->dev,

					    bo->tbo.ttm->pages,
@@ -245,8 +245,9 @@ static struct sg_table *amdgpu_dma_buf_map(struct dma_buf_attachment *attach, 
		break;



	case TTM_PL_VRAM:

		r = amdgpu_vram_mgr_alloc_sgt(adev, &bo->tbo.mem, 0,

				bo->tbo.base.size, attach->dev, dir, &sgt);

		r = amdgpu_vram_mgr_alloc_sgt(adev, bo->tbo.resource, 0,

					      bo->tbo.base.size, attach->dev,

					      dir, &sgt);

		if (r)

			return ERR_PTR(r);

		break;
@@ -436,7 +437,7 @@ amdgpu_dma_buf_move_notify(struct dma_buf_attachment *attach) 
	struct amdgpu_vm_bo_base *bo_base;

	int r;



	if (bo->tbo.mem.mem_type == TTM_PL_SYSTEM)

	if (bo->tbo.resource->mem_type == TTM_PL_SYSTEM)

		return;



	r = ttm_bo_validate(&bo->tbo, &placement, &ctx);

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

+2 −2
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ void amdgpu_gmc_get_pde_for_bo(struct amdgpu_bo *bo, int level, 
{

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



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

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

	case TTM_PL_TT:

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

		break;
@@ -112,7 +112,7 @@ void amdgpu_gmc_get_pde_for_bo(struct amdgpu_bo *bo, int level, 
		*addr = 0;

		break;

	}

	*flags = amdgpu_ttm_tt_pde_flags(bo->tbo.ttm, &bo->tbo.mem);

	*flags = amdgpu_ttm_tt_pde_flags(bo->tbo.ttm, bo->tbo.resource);

	amdgpu_gmc_get_vm_pde(adev, level, addr, flags);

}

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

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ static int amdgpu_gtt_mgr_new(struct ttm_resource_manager *man, 
	int r;



	spin_lock(&mgr->lock);

	if ((&tbo->mem == mem || tbo->mem.mem_type != TTM_PL_TT) &&

	if ((tbo->resource == mem || tbo->resource->mem_type != TTM_PL_TT) &&

	    atomic64_read(&mgr->available) < mem->num_pages) {

		spin_unlock(&mgr->lock);

		return -ENOSPC;