Commit c5835bbb authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: rename amdgpu_ttm_bind to amdgpu_ttm_alloc_gart 



We actually don't bind here, but rather allocate GART space if necessary.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent b2b7e457

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

+2 −2
Original line number Diff line number Diff line
@@ -684,7 +684,7 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p, 
	if (!r && p->uf_entry.robj) {

		struct amdgpu_bo *uf = p->uf_entry.robj;



		r = amdgpu_ttm_bind(&uf->tbo);

		r = amdgpu_ttm_alloc_gart(&uf->tbo);

		p->job->uf_addr += amdgpu_bo_gpu_offset(uf);

	}
@@ -1601,5 +1601,5 @@ int amdgpu_cs_find_mapping(struct amdgpu_cs_parser *parser, 
			return r;

	}



	return amdgpu_ttm_bind(&(*bo)->tbo);

	return amdgpu_ttm_alloc_gart(&(*bo)->tbo);

}

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

+1 −1
Original line number Diff line number Diff line
@@ -688,7 +688,7 @@ int amdgpu_bo_pin_restricted(struct amdgpu_bo *bo, u32 domain, 
		goto error;

	}



	r = amdgpu_ttm_bind(&bo->tbo);

	r = amdgpu_ttm_alloc_gart(&bo->tbo);

	if (unlikely(r)) {

		dev_err(adev->dev, "%p bind failed\n", bo);

		goto error;

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

+2 −2
Original line number Diff line number Diff line
@@ -875,7 +875,7 @@ static int amdgpu_ttm_backend_bind(struct ttm_tt *ttm, 
	return r;

}



int amdgpu_ttm_bind(struct ttm_buffer_object *bo)

int amdgpu_ttm_alloc_gart(struct ttm_buffer_object *bo)

{

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

	struct ttm_mem_reg tmp;
@@ -1601,7 +1601,7 @@ int amdgpu_fill_buffer(struct amdgpu_bo *bo, 
	}



	if (bo->tbo.mem.mem_type == TTM_PL_TT) {

		r = amdgpu_ttm_bind(&bo->tbo);

		r = amdgpu_ttm_alloc_gart(&bo->tbo);

		if (r)

			return r;

	}

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

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ int amdgpu_fill_buffer(struct amdgpu_bo *bo, 
			struct dma_fence **fence);



int amdgpu_mmap(struct file *filp, struct vm_area_struct *vma);

int amdgpu_ttm_bind(struct ttm_buffer_object *bo);

int amdgpu_ttm_alloc_gart(struct ttm_buffer_object *bo);

int amdgpu_ttm_recover_gart(struct ttm_buffer_object *tbo);



int amdgpu_ttm_tt_get_user_pages(struct ttm_tt *ttm, struct page **pages);

CRA Git | Maintained and supported by SUSTech CRA and CCSE