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

drm/ttm: cleanup BO size handling v3 



Based on an idea from Dave, but cleaned up a bit.

We had multiple fields for essentially the same thing.

Now bo->base.size is the original size of the BO in
arbitrary units, usually bytes.

bo->mem.num_pages is the size in number of pages in the
resource domain of bo->mem.mem_type.

v2: use the GEM object size instead of the BO size
v3: fix printks in some places

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: Huang Rui <ray.huang@amd.com> (v1)
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/406831/
parent dc379303

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

+1 −1
Original line number Diff line number Diff line
@@ -269,7 +269,7 @@ static struct sg_table *amdgpu_dma_buf_map(struct dma_buf_attachment *attach, 
	case TTM_PL_TT:

		sgt = drm_prime_pages_to_sg(obj->dev,

					    bo->tbo.ttm->pages,

					    bo->tbo.num_pages);

					    bo->tbo.ttm->num_pages);

		if (IS_ERR(sgt))

			return sgt;

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

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ uint64_t amdgpu_gmc_agp_addr(struct ttm_buffer_object *bo) 
{

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



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

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

		return AMDGPU_BO_INVALID_OFFSET;



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

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

+1 −1
Original line number Diff line number Diff line
@@ -787,7 +787,7 @@ int amdgpu_bo_kmap(struct amdgpu_bo *bo, void **ptr) 
	if (r < 0)

		return r;



	r = ttm_bo_kmap(&bo->tbo, 0, bo->tbo.num_pages, &bo->kmap);

	r = ttm_bo_kmap(&bo->tbo, 0, bo->tbo.mem.num_pages, &bo->kmap);

	if (r)

		return r;

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

+2 −2
Original line number Diff line number Diff line
@@ -174,12 +174,12 @@ static inline void amdgpu_bo_unreserve(struct amdgpu_bo *bo) 


static inline unsigned long amdgpu_bo_size(struct amdgpu_bo *bo)

{

	return bo->tbo.num_pages << PAGE_SHIFT;

	return bo->tbo.base.size;

}



static inline unsigned amdgpu_bo_ngpu_pages(struct amdgpu_bo *bo)

{

	return (bo->tbo.num_pages << PAGE_SHIFT) / AMDGPU_GPU_PAGE_SIZE;

	return bo->tbo.base.size / AMDGPU_GPU_PAGE_SIZE;

}



static inline unsigned amdgpu_bo_gpu_page_alignment(struct amdgpu_bo *bo)

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

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ TRACE_EVENT(amdgpu_bo_create, 


	    TP_fast_assign(

			   __entry->bo = bo;

			   __entry->pages = bo->tbo.num_pages;

			   __entry->pages = bo->tbo.mem.num_pages;

			   __entry->type = bo->tbo.mem.mem_type;

			   __entry->prefer = bo->preferred_domains;

			   __entry->allow = bo->allowed_domains;