Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

drm/amdgpu: remove extra parameter from amdgpu_ttm_bind() v2 



We always use the BO mem now.

v2: minor rebase

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 2a018f28

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, &uf->tbo.mem);

		r = amdgpu_ttm_bind(&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, &(*bo)->tbo.mem);

	return amdgpu_ttm_bind(&(*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, &bo->tbo.mem);

	r = amdgpu_ttm_bind(&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
@@ -889,7 +889,7 @@ bool amdgpu_ttm_is_bound(struct ttm_tt *ttm) 
	return gtt && !list_empty(&gtt->list);

}



int amdgpu_ttm_bind(struct ttm_buffer_object *bo, struct ttm_mem_reg *bo_mem)

int amdgpu_ttm_bind(struct ttm_buffer_object *bo)

{

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

	struct ttm_tt *ttm = bo->ttm;
@@ -1628,7 +1628,7 @@ int amdgpu_fill_buffer(struct amdgpu_bo *bo, 
	}



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

		r = amdgpu_ttm_bind(&bo->tbo, &bo->tbo.mem);

		r = amdgpu_ttm_bind(&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, 


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

bool amdgpu_ttm_is_bound(struct ttm_tt *ttm);

int amdgpu_ttm_bind(struct ttm_buffer_object *bo, struct ttm_mem_reg *bo_mem);

int amdgpu_ttm_bind(struct ttm_buffer_object *bo);

int amdgpu_ttm_recover_gart(struct amdgpu_device *adev);



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