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

Commit 9fdadb2c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-prime-vmap' of git://people.freedesktop.org/~airlied/linux 

Pull drm prime mmap/vmap code from Dave Airlie:
 "As mentioned previously these are the extra bits of drm that relied on
  the dma-buf pull to work, the first three just stub out the mmap
  interface, and the next set provide vmap export to i915/radeon/nouveau
  and vmap import to udl."

* 'drm-prime-vmap' of git://people.freedesktop.org/~airlied/linux:
  radeon: add radeon prime vmap support.
  nouveau: add vmap support to nouveau prime support
  udl: support vmapping imported dma-bufs
  i915: add dma-buf vmap support for exporting vmapped buffer
  radeon: add stub dma-buf mmap functionality
  nouveau: add stub dma-buf mmap functionality.
  i915: add stub dma-buf mmap callback.
parents 76f901eb 63bc620b

drivers/gpu/drm/i915/i915_drv.h

+3 −0
Original line number Diff line number Diff line
@@ -942,6 +942,9 @@ struct drm_i915_gem_object { 


	/* prime dma-buf support */

	struct sg_table *sg_table;

	void *dma_buf_vmapping;

	int vmapping_count;



	/**

	 * Used for performing relocations during execbuffer insertion.

	 */

drivers/gpu/drm/i915/i915_gem_dmabuf.c

+61 −0
Original line number Diff line number Diff line
@@ -74,6 +74,59 @@ static void i915_gem_dmabuf_release(struct dma_buf *dma_buf) 
	}

}



static void *i915_gem_dmabuf_vmap(struct dma_buf *dma_buf)

{

	struct drm_i915_gem_object *obj = dma_buf->priv;

	struct drm_device *dev = obj->base.dev;

	int ret;



	ret = i915_mutex_lock_interruptible(dev);

	if (ret)

		return ERR_PTR(ret);



	if (obj->dma_buf_vmapping) {

		obj->vmapping_count++;

		goto out_unlock;

	}



	if (!obj->pages) {

		ret = i915_gem_object_get_pages_gtt(obj, __GFP_NORETRY | __GFP_NOWARN);

		if (ret) {

			mutex_unlock(&dev->struct_mutex);

			return ERR_PTR(ret);

		}

	}



	obj->dma_buf_vmapping = vmap(obj->pages, obj->base.size / PAGE_SIZE, 0, PAGE_KERNEL);

	if (!obj->dma_buf_vmapping) {

		DRM_ERROR("failed to vmap object\n");

		goto out_unlock;

	}



	obj->vmapping_count = 1;

out_unlock:

	mutex_unlock(&dev->struct_mutex);

	return obj->dma_buf_vmapping;

}



static void i915_gem_dmabuf_vunmap(struct dma_buf *dma_buf, void *vaddr)

{

	struct drm_i915_gem_object *obj = dma_buf->priv;

	struct drm_device *dev = obj->base.dev;

	int ret;



	ret = i915_mutex_lock_interruptible(dev);

	if (ret)

		return;



	--obj->vmapping_count;

	if (obj->vmapping_count == 0) {

		vunmap(obj->dma_buf_vmapping);

		obj->dma_buf_vmapping = NULL;

	}

	mutex_unlock(&dev->struct_mutex);

}



static void *i915_gem_dmabuf_kmap_atomic(struct dma_buf *dma_buf, unsigned long page_num)

{

	return NULL;
@@ -93,6 +146,11 @@ static void i915_gem_dmabuf_kunmap(struct dma_buf *dma_buf, unsigned long page_n 


}



static int i915_gem_dmabuf_mmap(struct dma_buf *dma_buf, struct vm_area_struct *vma)

{

	return -EINVAL;

}



static const struct dma_buf_ops i915_dmabuf_ops =  {

	.map_dma_buf = i915_gem_map_dma_buf,

	.unmap_dma_buf = i915_gem_unmap_dma_buf,
@@ -101,6 +159,9 @@ static const struct dma_buf_ops i915_dmabuf_ops = { 
	.kmap_atomic = i915_gem_dmabuf_kmap_atomic,

	.kunmap = i915_gem_dmabuf_kunmap,

	.kunmap_atomic = i915_gem_dmabuf_kunmap_atomic,

	.mmap = i915_gem_dmabuf_mmap,

	.vmap = i915_gem_dmabuf_vmap,

	.vunmap = i915_gem_dmabuf_vunmap,

};



struct dma_buf *i915_gem_prime_export(struct drm_device *dev,

drivers/gpu/drm/nouveau/nouveau_drv.h

+3 −0
Original line number Diff line number Diff line
@@ -123,6 +123,9 @@ struct nouveau_bo { 


	struct drm_gem_object *gem;

	int pin_refcnt;



	struct ttm_bo_kmap_obj dma_buf_vmap;

	int vmapping_count;

};



#define nouveau_bo_tile_layout(nvbo)				\

drivers/gpu/drm/nouveau/nouveau_prime.c

+45 −0
Original line number Diff line number Diff line
@@ -61,6 +61,48 @@ static void nouveau_gem_kunmap(struct dma_buf *dma_buf, unsigned long page_num, 


}



static int nouveau_gem_prime_mmap(struct dma_buf *dma_buf, struct vm_area_struct *vma)

{

	return -EINVAL;

}



static void *nouveau_gem_prime_vmap(struct dma_buf *dma_buf)

{

	struct nouveau_bo *nvbo = dma_buf->priv;

	struct drm_device *dev = nvbo->gem->dev;

	int ret;



	mutex_lock(&dev->struct_mutex);

	if (nvbo->vmapping_count) {

		nvbo->vmapping_count++;

		goto out_unlock;

	}



	ret = ttm_bo_kmap(&nvbo->bo, 0, nvbo->bo.num_pages,

			  &nvbo->dma_buf_vmap);

	if (ret) {

		mutex_unlock(&dev->struct_mutex);

		return ERR_PTR(ret);

	}

	nvbo->vmapping_count = 1;

out_unlock:

	mutex_unlock(&dev->struct_mutex);

	return nvbo->dma_buf_vmap.virtual;

}



static void nouveau_gem_prime_vunmap(struct dma_buf *dma_buf, void *vaddr)

{

	struct nouveau_bo *nvbo = dma_buf->priv;

	struct drm_device *dev = nvbo->gem->dev;



	mutex_lock(&dev->struct_mutex);

	nvbo->vmapping_count--;

	if (nvbo->vmapping_count == 0) {

		ttm_bo_kunmap(&nvbo->dma_buf_vmap);

	}

	mutex_unlock(&dev->struct_mutex);

}



static const struct dma_buf_ops nouveau_dmabuf_ops =  {

	.map_dma_buf = nouveau_gem_map_dma_buf,

	.unmap_dma_buf = nouveau_gem_unmap_dma_buf,
@@ -69,6 +111,9 @@ static const struct dma_buf_ops nouveau_dmabuf_ops = { 
	.kmap_atomic = nouveau_gem_kmap_atomic,

	.kunmap = nouveau_gem_kunmap,

	.kunmap_atomic = nouveau_gem_kunmap_atomic,

	.mmap = nouveau_gem_prime_mmap,

	.vmap = nouveau_gem_prime_vmap,

	.vunmap = nouveau_gem_prime_vunmap,

};



static int

drivers/gpu/drm/radeon/radeon.h

+3 −0
Original line number Diff line number Diff line
@@ -346,6 +346,9 @@ struct radeon_bo { 
	/* Constant after initialization */

	struct radeon_device		*rdev;

	struct drm_gem_object		gem_base;



	struct ttm_bo_kmap_obj dma_buf_vmap;

	int vmapping_count;

};

#define gem_to_radeon_bo(gobj) container_of((gobj), struct radeon_bo, gem_base)