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

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

drm/ttm: add bo as parameter to the ttm_tt_create callback 



Instead of calculating the size in bytes just to recalculate the number
of pages from it pass the BO directly to the function.

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

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

+4 −4
Original line number Diff line number Diff line
@@ -982,20 +982,20 @@ static struct ttm_backend_func amdgpu_backend_func = { 
	.destroy = &amdgpu_ttm_backend_destroy,

};



static struct ttm_tt *amdgpu_ttm_tt_create(struct ttm_bo_device *bdev,

				    unsigned long size, uint32_t page_flags)

static struct ttm_tt *amdgpu_ttm_tt_create(struct ttm_buffer_object *bo,

					   uint32_t page_flags)

{

	struct amdgpu_device *adev;

	struct amdgpu_ttm_tt *gtt;



	adev = amdgpu_ttm_adev(bdev);

	adev = amdgpu_ttm_adev(bo->bdev);



	gtt = kzalloc(sizeof(struct amdgpu_ttm_tt), GFP_KERNEL);

	if (gtt == NULL) {

		return NULL;

	}

	gtt->ttm.ttm.func = &amdgpu_backend_func;

	if (ttm_sg_tt_init(&gtt->ttm, bdev, size, page_flags)) {

	if (ttm_sg_tt_init(&gtt->ttm, bo, page_flags)) {

		kfree(gtt);

		return NULL;

	}

drivers/gpu/drm/ast/ast_ttm.c

+3 −3
Original line number Diff line number Diff line
@@ -199,8 +199,8 @@ static struct ttm_backend_func ast_tt_backend_func = { 
};





static struct ttm_tt *ast_ttm_tt_create(struct ttm_bo_device *bdev,

				 unsigned long size, uint32_t page_flags)

static struct ttm_tt *ast_ttm_tt_create(struct ttm_buffer_object *bo,

					uint32_t page_flags)

{

	struct ttm_tt *tt;
@@ -208,7 +208,7 @@ static struct ttm_tt *ast_ttm_tt_create(struct ttm_bo_device *bdev, 
	if (tt == NULL)

		return NULL;

	tt->func = &ast_tt_backend_func;

	if (ttm_tt_init(tt, bdev, size, page_flags)) {

	if (ttm_tt_init(tt, bo, page_flags)) {

		kfree(tt);

		return NULL;

	}

drivers/gpu/drm/bochs/bochs_mm.c

+2 −3
Original line number Diff line number Diff line
@@ -176,8 +176,7 @@ static struct ttm_backend_func bochs_tt_backend_func = { 
	.destroy = &bochs_ttm_backend_destroy,

};



static struct ttm_tt *bochs_ttm_tt_create(struct ttm_bo_device *bdev,

					  unsigned long size,

static struct ttm_tt *bochs_ttm_tt_create(struct ttm_buffer_object *bo,

					  uint32_t page_flags)

{

	struct ttm_tt *tt;
@@ -186,7 +185,7 @@ static struct ttm_tt *bochs_ttm_tt_create(struct ttm_bo_device *bdev, 
	if (tt == NULL)

		return NULL;

	tt->func = &bochs_tt_backend_func;

	if (ttm_tt_init(tt, bdev, size, page_flags)) {

	if (ttm_tt_init(tt, bo, page_flags)) {

		kfree(tt);

		return NULL;

	}

drivers/gpu/drm/cirrus/cirrus_ttm.c

+3 −3
Original line number Diff line number Diff line
@@ -199,8 +199,8 @@ static struct ttm_backend_func cirrus_tt_backend_func = { 
};





static struct ttm_tt *cirrus_ttm_tt_create(struct ttm_bo_device *bdev,

				 unsigned long size, uint32_t page_flags)

static struct ttm_tt *cirrus_ttm_tt_create(struct ttm_buffer_object *bo,

					   uint32_t page_flags)

{

	struct ttm_tt *tt;
@@ -208,7 +208,7 @@ static struct ttm_tt *cirrus_ttm_tt_create(struct ttm_bo_device *bdev, 
	if (tt == NULL)

		return NULL;

	tt->func = &cirrus_tt_backend_func;

	if (ttm_tt_init(tt, bdev, size, page_flags)) {

	if (ttm_tt_init(tt, bo, page_flags)) {

		kfree(tt);

		return NULL;

	}

drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c

+2 −3
Original line number Diff line number Diff line
@@ -200,8 +200,7 @@ static struct ttm_backend_func hibmc_tt_backend_func = { 
	.destroy = &hibmc_ttm_backend_destroy,

};



static struct ttm_tt *hibmc_ttm_tt_create(struct ttm_bo_device *bdev,

					  unsigned long size,

static struct ttm_tt *hibmc_ttm_tt_create(struct ttm_buffer_object *bo,

					  u32 page_flags)

{

	struct ttm_tt *tt;
@@ -213,7 +212,7 @@ static struct ttm_tt *hibmc_ttm_tt_create(struct ttm_bo_device *bdev, 
		return NULL;

	}

	tt->func = &hibmc_tt_backend_func;

	ret = ttm_tt_init(tt, bdev, size, page_flags);

	ret = ttm_tt_init(tt, bo, page_flags);

	if (ret) {

		DRM_ERROR("failed to initialize ttm_tt: %d\n", ret);

		kfree(tt);