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

Commit 22b33e8e authored by Dave Airlie's avatar Dave Airlie
Browse files

nouveau: add PRIME support 



This adds prime->fd and fd->prime support to nouveau,
it passes the SG object to TTM, and then populates the
GART entries using it.

v2: add stubbed kmap + use new function to fill out pages array
for faulting + add reimport test.

Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 129b78bf

drivers/gpu/drm/nouveau/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ nouveau-y := nouveau_drv.o nouveau_state.o nouveau_channel.o nouveau_mem.o \ 
	     nv50_calc.o \

	     nv04_pm.o nv40_pm.o nv50_pm.o nva3_pm.o nvc0_pm.o \

	     nv50_vram.o nvc0_vram.o \

	     nv50_vm.o nvc0_vm.o

	     nv50_vm.o nvc0_vm.o nouveau_prime.o



nouveau-$(CONFIG_DRM_NOUVEAU_DEBUG) += nouveau_debugfs.o

nouveau-$(CONFIG_COMPAT) += nouveau_ioc32.o

drivers/gpu/drm/nouveau/nouveau_bo.c

+34 −8
Original line number Diff line number Diff line
@@ -89,12 +89,17 @@ nouveau_bo_fixup_align(struct nouveau_bo *nvbo, u32 flags, 
int

nouveau_bo_new(struct drm_device *dev, int size, int align,

	       uint32_t flags, uint32_t tile_mode, uint32_t tile_flags,

	       struct sg_table *sg,

	       struct nouveau_bo **pnvbo)

{

	struct drm_nouveau_private *dev_priv = dev->dev_private;

	struct nouveau_bo *nvbo;

	size_t acc_size;

	int ret;

	int type = ttm_bo_type_device;



	if (sg)

		type = ttm_bo_type_sg;



	nvbo = kzalloc(sizeof(struct nouveau_bo), GFP_KERNEL);

	if (!nvbo)
@@ -120,8 +125,8 @@ nouveau_bo_new(struct drm_device *dev, int size, int align, 
				       sizeof(struct nouveau_bo));



	ret = ttm_bo_init(&dev_priv->ttm.bdev, &nvbo->bo, size,

			  ttm_bo_type_device, &nvbo->placement,

			  align >> PAGE_SHIFT, 0, false, NULL, acc_size, NULL,

			  type, &nvbo->placement,

			  align >> PAGE_SHIFT, 0, false, NULL, acc_size, sg,

			  nouveau_bo_del_ttm);

	if (ret) {

		/* ttm will call nouveau_bo_del_ttm if it fails.. */
@@ -817,6 +822,11 @@ nouveau_bo_move_ntfy(struct ttm_buffer_object *bo, struct ttm_mem_reg *new_mem) 
		} else

		if (new_mem && new_mem->mem_type == TTM_PL_TT &&

		    nvbo->page_shift == vma->vm->spg_shift) {

			if (((struct nouveau_mem *)new_mem->mm_node)->sg)

				nouveau_vm_map_sg_table(vma, 0, new_mem->

						  num_pages << PAGE_SHIFT,

						  new_mem->mm_node);

			else

				nouveau_vm_map_sg(vma, 0, new_mem->

						  num_pages << PAGE_SHIFT,

						  new_mem->mm_node);
@@ -1058,10 +1068,19 @@ nouveau_ttm_tt_populate(struct ttm_tt *ttm) 
	struct drm_device *dev;

	unsigned i;

	int r;

	bool slave = !!(ttm->page_flags & TTM_PAGE_FLAG_SG);



	if (ttm->state != tt_unpopulated)

		return 0;



	if (slave && ttm->sg) {

		/* make userspace faulting work */

		drm_prime_sg_to_page_addr_arrays(ttm->sg, ttm->pages,

						 ttm_dma->dma_address, ttm->num_pages);

		ttm->state = tt_unbound;

		return 0;

	}



	dev_priv = nouveau_bdev(ttm->bdev);

	dev = dev_priv->dev;
@@ -1106,6 +1125,10 @@ nouveau_ttm_tt_unpopulate(struct ttm_tt *ttm) 
	struct drm_nouveau_private *dev_priv;

	struct drm_device *dev;

	unsigned i;

	bool slave = !!(ttm->page_flags & TTM_PAGE_FLAG_SG);



	if (slave)

		return;



	dev_priv = nouveau_bdev(ttm->bdev);

	dev = dev_priv->dev;
@@ -1181,9 +1204,12 @@ nouveau_bo_vma_add(struct nouveau_bo *nvbo, struct nouveau_vm *vm, 


	if (nvbo->bo.mem.mem_type == TTM_PL_VRAM)

		nouveau_vm_map(vma, nvbo->bo.mem.mm_node);

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

		if (node->sg)

			nouveau_vm_map_sg_table(vma, 0, size, node);

		else

	if (nvbo->bo.mem.mem_type == TTM_PL_TT)

			nouveau_vm_map_sg(vma, 0, size, node);

	}



	list_add_tail(&vma->head, &nvbo->vma_list);

	vma->refcount = 1;

drivers/gpu/drm/nouveau/nouveau_channel.c

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ nouveau_channel_pushbuf_init(struct nouveau_channel *chan) 
	int ret;



	/* allocate buffer object */

	ret = nouveau_bo_new(dev, 65536, 0, mem, 0, 0, &chan->pushbuf_bo);

	ret = nouveau_bo_new(dev, 65536, 0, mem, 0, 0, NULL, &chan->pushbuf_bo);

	if (ret)

		goto out;

drivers/gpu/drm/nouveau/nouveau_drv.c

+7 −1
Original line number Diff line number Diff line
@@ -408,7 +408,7 @@ static struct drm_driver driver = { 
	.driver_features =

		DRIVER_USE_AGP | DRIVER_PCI_DMA | DRIVER_SG |

		DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_GEM |

		DRIVER_MODESET,

		DRIVER_MODESET | DRIVER_PRIME,

	.load = nouveau_load,

	.firstopen = nouveau_firstopen,

	.lastclose = nouveau_lastclose,
@@ -430,6 +430,12 @@ static struct drm_driver driver = { 
	.reclaim_buffers = drm_core_reclaim_buffers,

	.ioctls = nouveau_ioctls,

	.fops = &nouveau_driver_fops,



	.prime_handle_to_fd = drm_gem_prime_handle_to_fd,

	.prime_fd_to_handle = drm_gem_prime_fd_to_handle,

	.gem_prime_export = nouveau_gem_prime_export,

	.gem_prime_import = nouveau_gem_prime_import,



	.gem_init_object = nouveau_gem_object_new,

	.gem_free_object = nouveau_gem_object_del,

	.gem_open_object = nouveau_gem_object_open,

drivers/gpu/drm/nouveau/nouveau_drv.h

+9 −1
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ struct nouveau_mem { 
	u32 memtype;

	u64 offset;

	u64 size;

	struct sg_table *sg;

};



struct nouveau_tile_reg {
@@ -1416,7 +1417,9 @@ extern int nv04_crtc_create(struct drm_device *, int index); 
extern struct ttm_bo_driver nouveau_bo_driver;

extern int nouveau_bo_new(struct drm_device *, int size, int align,

			  uint32_t flags, uint32_t tile_mode,

			  uint32_t tile_flags, struct nouveau_bo **);

			  uint32_t tile_flags,

			  struct sg_table *sg,

			  struct nouveau_bo **);

extern int nouveau_bo_pin(struct nouveau_bo *, uint32_t flags);

extern int nouveau_bo_unpin(struct nouveau_bo *);

extern int nouveau_bo_map(struct nouveau_bo *);
@@ -1501,6 +1504,11 @@ extern int nouveau_gem_ioctl_cpu_fini(struct drm_device *, void *, 
extern int nouveau_gem_ioctl_info(struct drm_device *, void *,

				  struct drm_file *);



extern struct dma_buf *nouveau_gem_prime_export(struct drm_device *dev,

				struct drm_gem_object *obj, int flags);

extern struct drm_gem_object *nouveau_gem_prime_import(struct drm_device *dev,

				struct dma_buf *dma_buf);



/* nouveau_display.c */

int nouveau_display_create(struct drm_device *dev);

void nouveau_display_destroy(struct drm_device *dev);