Commit 0a667b50 authored by Dave Airlie's avatar Dave Airlie
Browse files

drm/ttm: remove bdev from ttm_tt 



I want to split this structure up and use it differently,
step one remove bdev pointer from it and pass it explicitly.

Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200826014428.828392-4-airlied@gmail.com
parent f437bc1e

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

+23 −17
Original line number Diff line number Diff line
@@ -565,7 +565,7 @@ static int amdgpu_move_vram_ram(struct ttm_buffer_object *bo, bool evict, 
	}



	/* Bind the memory to the GTT space */

	r = ttm_tt_bind(bo->ttm, &tmp_mem, ctx);

	r = ttm_tt_bind(bo->bdev, bo->ttm, &tmp_mem, ctx);

	if (unlikely(r)) {

		goto out_cleanup;

	}
@@ -991,9 +991,10 @@ void amdgpu_ttm_tt_set_user_pages(struct ttm_tt *ttm, struct page **pages) 
 *

 * Called by amdgpu_ttm_backend_bind()

 **/

static int amdgpu_ttm_tt_pin_userptr(struct ttm_tt *ttm)

static int amdgpu_ttm_tt_pin_userptr(struct ttm_bo_device *bdev,

				     struct ttm_tt *ttm)

{

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

	struct amdgpu_device *adev = amdgpu_ttm_adev(bdev);

	struct amdgpu_ttm_tt *gtt = (void *)ttm;

	int r;
@@ -1027,9 +1028,10 @@ release_sg: 
/**

 * amdgpu_ttm_tt_unpin_userptr - Unpin and unmap userptr pages

 */

static void amdgpu_ttm_tt_unpin_userptr(struct ttm_tt *ttm)

static void amdgpu_ttm_tt_unpin_userptr(struct ttm_bo_device *bdev,

					struct ttm_tt *ttm)

{

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

	struct amdgpu_device *adev = amdgpu_ttm_adev(bdev);

	struct amdgpu_ttm_tt *gtt = (void *)ttm;



	int write = !(gtt->userflags & AMDGPU_GEM_USERPTR_READONLY);
@@ -1110,16 +1112,17 @@ gart_bind_fail: 
 * Called by ttm_tt_bind() on behalf of ttm_bo_handle_move_mem().

 * This handles binding GTT memory to the device address space.

 */

static int amdgpu_ttm_backend_bind(struct ttm_tt *ttm,

static int amdgpu_ttm_backend_bind(struct ttm_bo_device *bdev,

				   struct ttm_tt *ttm,

				   struct ttm_resource *bo_mem)

{

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

	struct amdgpu_device *adev = amdgpu_ttm_adev(bdev);

	struct amdgpu_ttm_tt *gtt = (void*)ttm;

	uint64_t flags;

	int r = 0;



	if (gtt->userptr) {

		r = amdgpu_ttm_tt_pin_userptr(ttm);

		r = amdgpu_ttm_tt_pin_userptr(bdev, ttm);

		if (r) {

			DRM_ERROR("failed to pin userptr\n");

			return r;
@@ -1237,15 +1240,16 @@ int amdgpu_ttm_recover_gart(struct ttm_buffer_object *tbo) 
 * Called by ttm_tt_unbind() on behalf of ttm_bo_move_ttm() and

 * ttm_tt_destroy().

 */

static void amdgpu_ttm_backend_unbind(struct ttm_tt *ttm)

static void amdgpu_ttm_backend_unbind(struct ttm_bo_device *bdev,

				      struct ttm_tt *ttm)

{

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

	struct amdgpu_device *adev = amdgpu_ttm_adev(bdev);

	struct amdgpu_ttm_tt *gtt = (void *)ttm;

	int r;



	/* if the pages have userptr pinning then clear that first */

	if (gtt->userptr)

		amdgpu_ttm_tt_unpin_userptr(ttm);

		amdgpu_ttm_tt_unpin_userptr(bdev, ttm);



	if (gtt->offset == AMDGPU_BO_INVALID_OFFSET)

		return;
@@ -1257,7 +1261,8 @@ static void amdgpu_ttm_backend_unbind(struct ttm_tt *ttm) 
			  gtt->ttm.ttm.num_pages, gtt->offset);

}



static void amdgpu_ttm_backend_destroy(struct ttm_tt *ttm)

static void amdgpu_ttm_backend_destroy(struct ttm_bo_device *bdev,

				       struct ttm_tt *ttm)

{

	struct amdgpu_ttm_tt *gtt = (void *)ttm;
@@ -1307,10 +1312,11 @@ static struct ttm_tt *amdgpu_ttm_tt_create(struct ttm_buffer_object *bo, 
 * Map the pages of a ttm_tt object to an address space visible

 * to the underlying device.

 */

static int amdgpu_ttm_tt_populate(struct ttm_tt *ttm,

static int amdgpu_ttm_tt_populate(struct ttm_bo_device *bdev,

				  struct ttm_tt *ttm,

				  struct ttm_operation_ctx *ctx)

{

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

	struct amdgpu_device *adev = amdgpu_ttm_adev(bdev);

	struct amdgpu_ttm_tt *gtt = (void *)ttm;



	/* user pages are bound by amdgpu_ttm_tt_pin_userptr() */
@@ -1361,7 +1367,7 @@ static int amdgpu_ttm_tt_populate(struct ttm_tt *ttm, 
 * Unmaps pages of a ttm_tt object from the device address space and

 * unpopulates the page array backing it.

 */

static void amdgpu_ttm_tt_unpopulate(struct ttm_tt *ttm)

static void amdgpu_ttm_tt_unpopulate(struct ttm_bo_device *bdev, struct ttm_tt *ttm)

{

	struct amdgpu_ttm_tt *gtt = (void *)ttm;

	struct amdgpu_device *adev;
@@ -1385,7 +1391,7 @@ static void amdgpu_ttm_tt_unpopulate(struct ttm_tt *ttm) 
	if (ttm->page_flags & TTM_PAGE_FLAG_SG)

		return;



	adev = amdgpu_ttm_adev(ttm->bdev);

	adev = amdgpu_ttm_adev(bdev);



#ifdef CONFIG_SWIOTLB

	if (adev->need_swiotlb && swiotlb_nr_tbl()) {

drivers/gpu/drm/drm_gem_vram_helper.c

+1 −1
Original line number Diff line number Diff line
@@ -967,7 +967,7 @@ static const struct drm_gem_object_funcs drm_gem_vram_object_funcs = { 
 * TTM TT

 */



static void backend_func_destroy(struct ttm_tt *tt)

static void backend_func_destroy(struct ttm_bo_device *bdev, struct ttm_tt *tt)

{

	ttm_tt_fini(tt);

	kfree(tt);

drivers/gpu/drm/nouveau/nouveau_bo.c

+9 −7
Original line number Diff line number Diff line
@@ -848,7 +848,7 @@ nouveau_bo_move_flipd(struct ttm_buffer_object *bo, bool evict, bool intr, 
	if (ret)

		return ret;



	ret = ttm_tt_bind(bo->ttm, &tmp_reg, &ctx);

	ret = ttm_tt_bind(bo->bdev, bo->ttm, &tmp_reg, &ctx);

	if (ret)

		goto out;
@@ -1219,7 +1219,8 @@ nouveau_ttm_fault_reserve_notify(struct ttm_buffer_object *bo) 
}



static int

nouveau_ttm_tt_populate(struct ttm_tt *ttm, struct ttm_operation_ctx *ctx)

nouveau_ttm_tt_populate(struct ttm_bo_device *bdev,

			struct ttm_tt *ttm, struct ttm_operation_ctx *ctx)

{

	struct ttm_dma_tt *ttm_dma = (void *)ttm;

	struct nouveau_drm *drm;
@@ -1237,12 +1238,12 @@ nouveau_ttm_tt_populate(struct ttm_tt *ttm, struct ttm_operation_ctx *ctx) 
		return 0;

	}



	drm = nouveau_bdev(ttm->bdev);

	drm = nouveau_bdev(bdev);

	dev = drm->dev->dev;



#if IS_ENABLED(CONFIG_AGP)

	if (drm->agp.bridge) {

		return ttm_agp_tt_populate(ttm, ctx);

		return ttm_agp_tt_populate(bdev, ttm, ctx);

	}

#endif
@@ -1255,7 +1256,8 @@ nouveau_ttm_tt_populate(struct ttm_tt *ttm, struct ttm_operation_ctx *ctx) 
}



static void

nouveau_ttm_tt_unpopulate(struct ttm_tt *ttm)

nouveau_ttm_tt_unpopulate(struct ttm_bo_device *bdev,

			  struct ttm_tt *ttm)

{

	struct ttm_dma_tt *ttm_dma = (void *)ttm;

	struct nouveau_drm *drm;
@@ -1265,12 +1267,12 @@ nouveau_ttm_tt_unpopulate(struct ttm_tt *ttm) 
	if (slave)

		return;



	drm = nouveau_bdev(ttm->bdev);

	drm = nouveau_bdev(bdev);

	dev = drm->dev->dev;



#if IS_ENABLED(CONFIG_AGP)

	if (drm->agp.bridge) {

		ttm_agp_tt_unpopulate(ttm);

		ttm_agp_tt_unpopulate(bdev, ttm);

		return;

	}

#endif

drivers/gpu/drm/nouveau/nouveau_sgdma.c

+4 −4
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ struct nouveau_sgdma_be { 
};



static void

nouveau_sgdma_destroy(struct ttm_tt *ttm)

nouveau_sgdma_destroy(struct ttm_bo_device *bdev, struct ttm_tt *ttm)

{

	struct nouveau_sgdma_be *nvbe = (struct nouveau_sgdma_be *)ttm;
@@ -26,7 +26,7 @@ nouveau_sgdma_destroy(struct ttm_tt *ttm) 
}



static int

nv04_sgdma_bind(struct ttm_tt *ttm, struct ttm_resource *reg)

nv04_sgdma_bind(struct ttm_bo_device *bdev, struct ttm_tt *ttm, struct ttm_resource *reg)

{

	struct nouveau_sgdma_be *nvbe = (struct nouveau_sgdma_be *)ttm;

	struct nouveau_mem *mem = nouveau_mem(reg);
@@ -47,7 +47,7 @@ nv04_sgdma_bind(struct ttm_tt *ttm, struct ttm_resource *reg) 
}



static void

nv04_sgdma_unbind(struct ttm_tt *ttm)

nv04_sgdma_unbind(struct ttm_bo_device *bdev, struct ttm_tt *ttm)

{

	struct nouveau_sgdma_be *nvbe = (struct nouveau_sgdma_be *)ttm;

	nouveau_mem_fini(nvbe->mem);
@@ -60,7 +60,7 @@ static struct ttm_backend_func nv04_sgdma_backend = { 
};



static int

nv50_sgdma_bind(struct ttm_tt *ttm, struct ttm_resource *reg)

nv50_sgdma_bind(struct ttm_bo_device *bdev, struct ttm_tt *ttm, struct ttm_resource *reg)

{

	struct nouveau_sgdma_be *nvbe = (struct nouveau_sgdma_be *)ttm;

	struct nouveau_mem *mem = nouveau_mem(reg);

drivers/gpu/drm/qxl/qxl_ttm.c

+6 −3
Original line number Diff line number Diff line
@@ -104,7 +104,8 @@ struct qxl_ttm_tt { 
	u64				offset;

};



static int qxl_ttm_backend_bind(struct ttm_tt *ttm,

static int qxl_ttm_backend_bind(struct ttm_bo_device *bdev,

				struct ttm_tt *ttm,

				struct ttm_resource *bo_mem)

{

	struct qxl_ttm_tt *gtt = (void *)ttm;
@@ -118,12 +119,14 @@ static int qxl_ttm_backend_bind(struct ttm_tt *ttm, 
	return -1;

}



static void qxl_ttm_backend_unbind(struct ttm_tt *ttm)

static void qxl_ttm_backend_unbind(struct ttm_bo_device *bdev,

				   struct ttm_tt *ttm)

{

	/* Not implemented */

}



static void qxl_ttm_backend_destroy(struct ttm_tt *ttm)

static void qxl_ttm_backend_destroy(struct ttm_bo_device *bdev,

				    struct ttm_tt *ttm)

{

	struct qxl_ttm_tt *gtt = (void *)ttm;

CRA Git | Maintained and supported by SUSTech CRA and CCSE