Commit 8635784a authored by Dave Airlie's avatar Dave Airlie
Browse files

drm/nouveau/ttm: use driver bind/unbind/destroy functions. 



Acked-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarBen Skeggs <bskeggs@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200907204630.1406528-7-airlied@gmail.com
parent a68bb193

drivers/gpu/drm/nouveau/nouveau_bo.c

+44 −0
Original line number Diff line number Diff line
@@ -668,6 +668,33 @@ nouveau_ttm_tt_create(struct ttm_buffer_object *bo, uint32_t page_flags) 
	return nouveau_sgdma_create_ttm(bo, page_flags);

}



static int

nouveau_ttm_tt_bind(struct ttm_bo_device *bdev, struct ttm_tt *ttm,

		    struct ttm_resource *reg)

{

#if IS_ENABLED(CONFIG_AGP)

	struct nouveau_drm *drm = nouveau_bdev(bdev);



	if (drm->agp.bridge)

		return ttm_agp_bind(bdev, ttm, reg);

#endif

	return nouveau_sgdma_bind(bdev, ttm, reg);

}



static void

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

{

#if IS_ENABLED(CONFIG_AGP)

	struct nouveau_drm *drm = nouveau_bdev(bdev);



	if (drm->agp.bridge) {

		ttm_agp_unbind(bdev, ttm);

		return;

	}

#endif

	nouveau_sgdma_unbind(bdev, ttm);

}



static void

nouveau_bo_evict_flags(struct ttm_buffer_object *bo, struct ttm_placement *pl)

{
@@ -1284,6 +1311,20 @@ nouveau_ttm_tt_unpopulate(struct ttm_bo_device *bdev, 
	ttm_unmap_and_unpopulate_pages(dev, ttm_dma);

}



static void

nouveau_ttm_tt_destroy(struct ttm_bo_device *bdev,

		       struct ttm_tt *ttm)

{

#if IS_ENABLED(CONFIG_AGP)

	struct nouveau_drm *drm = nouveau_bdev(bdev);

	if (drm->agp.bridge) {

		ttm_agp_destroy(bdev, ttm);

		return;

	}

#endif

	nouveau_sgdma_destroy(bdev, ttm);

}



void

nouveau_bo_fence(struct nouveau_bo *nvbo, struct nouveau_fence *fence, bool exclusive)

{
@@ -1299,6 +1340,9 @@ struct ttm_bo_driver nouveau_bo_driver = { 
	.ttm_tt_create = &nouveau_ttm_tt_create,

	.ttm_tt_populate = &nouveau_ttm_tt_populate,

	.ttm_tt_unpopulate = &nouveau_ttm_tt_unpopulate,

	.ttm_tt_bind = &nouveau_ttm_tt_bind,

	.ttm_tt_unbind = &nouveau_ttm_tt_unbind,

	.ttm_tt_destroy = &nouveau_ttm_tt_destroy,

	.eviction_valuable = ttm_bo_eviction_valuable,

	.evict_flags = nouveau_bo_evict_flags,

	.move_notify = nouveau_bo_move_ntfy,

drivers/gpu/drm/nouveau/nouveau_sgdma.c

+12 −42
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ struct nouveau_sgdma_be { 
	struct nouveau_mem *mem;

};



static void

void

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

{

	struct nouveau_sgdma_be *nvbe = (struct nouveau_sgdma_be *)ttm;
@@ -25,10 +25,11 @@ nouveau_sgdma_destroy(struct ttm_bo_device *bdev, struct ttm_tt *ttm) 
	}

}



static int

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

int

nouveau_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_drm *drm = nouveau_bdev(bdev);

	struct nouveau_mem *mem = nouveau_mem(reg);

	int ret;
@@ -36,65 +37,34 @@ nv04_sgdma_bind(struct ttm_bo_device *bdev, struct ttm_tt *ttm, struct ttm_resou 
	if (ret)

		return ret;



	if (drm->client.device.info.family < NV_DEVICE_INFO_V0_TESLA) {

		ret = nouveau_mem_map(mem, &mem->cli->vmm.vmm, &mem->vma[0]);

		if (ret) {

			nouveau_mem_fini(mem);

			return ret;

		}

	}



	nvbe->mem = mem;

	return 0;

}



static void

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

void

nouveau_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);

}



static struct ttm_backend_func nv04_sgdma_backend = {

	.bind			= nv04_sgdma_bind,

	.unbind			= nv04_sgdma_unbind,

	.destroy		= nouveau_sgdma_destroy

};



static int

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);

	int ret;



	ret = nouveau_mem_host(reg, &nvbe->ttm);

	if (ret)

		return ret;



	nvbe->mem = mem;

	return 0;

}



static struct ttm_backend_func nv50_sgdma_backend = {

	.bind			= nv50_sgdma_bind,

	.unbind			= nv04_sgdma_unbind,

	.destroy		= nouveau_sgdma_destroy

};



struct ttm_tt *

nouveau_sgdma_create_ttm(struct ttm_buffer_object *bo, uint32_t page_flags)

{

	struct nouveau_drm *drm = nouveau_bdev(bo->bdev);

	struct nouveau_sgdma_be *nvbe;



	nvbe = kzalloc(sizeof(*nvbe), GFP_KERNEL);

	if (!nvbe)

		return NULL;



	if (drm->client.device.info.family < NV_DEVICE_INFO_V0_TESLA)

		nvbe->ttm.ttm.func = &nv04_sgdma_backend;

	else

		nvbe->ttm.ttm.func = &nv50_sgdma_backend;



	if (ttm_dma_tt_init(&nvbe->ttm, bo, page_flags)) {

		kfree(nvbe);

		return NULL;

drivers/gpu/drm/nouveau/nouveau_ttm.h

+3 −0
Original line number Diff line number Diff line
@@ -22,4 +22,7 @@ int nouveau_ttm_mmap(struct file *, struct vm_area_struct *); 
int  nouveau_ttm_global_init(struct nouveau_drm *);

void nouveau_ttm_global_release(struct nouveau_drm *);



int nouveau_sgdma_bind(struct ttm_bo_device *bdev, struct ttm_tt *ttm, struct ttm_resource *reg);

void nouveau_sgdma_unbind(struct ttm_bo_device *bdev, struct ttm_tt *ttm);

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

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE