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

Commit 7a42e83d authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'for-airlied-next' of git://people.freedesktop.org/~mlankhorst/linux into drm-next 

fixups for nouveau and fencing

* 'for-airlied-next' of git://people.freedesktop.org/~mlankhorst/linux:
  drm/nouveau: export reservation_object from dmabuf to ttm
  drm/ttm: add reservation_object as argument to ttm_bo_init
  drm: Pass dma-buf as argument to gem_prime_import_sg_table
  drm/nouveau: assign fence_chan->name correctly
  drm/nouveau: specify if interruptible wait is desired in nouveau_fence_sync
  drm/nouveau: bump driver patchlevel to 1.2.1
parents c5939a73 bb6178b0

drivers/gpu/drm/ast/ast_ttm.c

+1 −1
Original line number Diff line number Diff line
@@ -339,7 +339,7 @@ int ast_bo_create(struct drm_device *dev, int size, int align, 
	ret = ttm_bo_init(&ast->ttm.bdev, &astbo->bo, size,

			  ttm_bo_type_device, &astbo->placement,

			  align >> PAGE_SHIFT, false, NULL, acc_size,

			  NULL, ast_bo_ttm_destroy);

			  NULL, NULL, ast_bo_ttm_destroy);

	if (ret)

		return ret;

drivers/gpu/drm/bochs/bochs_mm.c

+1 −1
Original line number Diff line number Diff line
@@ -377,7 +377,7 @@ static int bochs_bo_create(struct drm_device *dev, int size, int align, 
	ret = ttm_bo_init(&bochs->ttm.bdev, &bochsbo->bo, size,

			  ttm_bo_type_device, &bochsbo->placement,

			  align >> PAGE_SHIFT, false, NULL, acc_size,

			  NULL, bochs_bo_ttm_destroy);

			  NULL, NULL, bochs_bo_ttm_destroy);

	if (ret)

		return ret;

drivers/gpu/drm/cirrus/cirrus_ttm.c

+1 −1
Original line number Diff line number Diff line
@@ -343,7 +343,7 @@ int cirrus_bo_create(struct drm_device *dev, int size, int align, 
	ret = ttm_bo_init(&cirrus->ttm.bdev, &cirrusbo->bo, size,

			  ttm_bo_type_device, &cirrusbo->placement,

			  align >> PAGE_SHIFT, false, NULL, acc_size,

			  NULL, cirrus_bo_ttm_destroy);

			  NULL, NULL, cirrus_bo_ttm_destroy);

	if (ret)

		return ret;

drivers/gpu/drm/drm_gem_cma_helper.c

+4 −3
Original line number Diff line number Diff line
@@ -316,7 +316,8 @@ struct sg_table *drm_gem_cma_prime_get_sg_table(struct drm_gem_object *obj) 
EXPORT_SYMBOL_GPL(drm_gem_cma_prime_get_sg_table);



struct drm_gem_object *

drm_gem_cma_prime_import_sg_table(struct drm_device *dev, size_t size,

drm_gem_cma_prime_import_sg_table(struct drm_device *dev,

				  struct dma_buf_attachment *attach,

				  struct sg_table *sgt)

{

	struct drm_gem_cma_object *cma_obj;
@@ -325,14 +326,14 @@ drm_gem_cma_prime_import_sg_table(struct drm_device *dev, size_t size, 
		return ERR_PTR(-EINVAL);



	/* Create a CMA GEM buffer. */

	cma_obj = __drm_gem_cma_create(dev, size);

	cma_obj = __drm_gem_cma_create(dev, attach->dmabuf->size);

	if (IS_ERR(cma_obj))

		return ERR_CAST(cma_obj);



	cma_obj->paddr = sg_dma_address(sgt->sgl);

	cma_obj->sgt = sgt;



	DRM_DEBUG_PRIME("dma_addr = %pad, size = %zu\n", &cma_obj->paddr, size);

	DRM_DEBUG_PRIME("dma_addr = %pad, size = %zu\n", &cma_obj->paddr, attach->dmabuf->size);



	return &cma_obj->base;

}

drivers/gpu/drm/drm_prime.c

+1 −1
Original line number Diff line number Diff line
@@ -525,7 +525,7 @@ struct drm_gem_object *drm_gem_prime_import(struct drm_device *dev, 
		goto fail_detach;

	}



	obj = dev->driver->gem_prime_import_sg_table(dev, dma_buf->size, sgt);

	obj = dev->driver->gem_prime_import_sg_table(dev, attach, sgt);

	if (IS_ERR(obj)) {

		ret = PTR_ERR(obj);

		goto fail_unmap;