linux-next: manual merge of the dma-buf tree with the drm-intel tree

[Stephen Rothwell]

Hi Sumit,

Today's linux-next merge of the dma-buf tree got a conflict in
drivers/gpu/drm/i915/i915_gem_dmabuf.c between commit 5cc9ed4b9a7a
("drm/i915: Introduce mapping of user pages into video memory (userptr)
ioctl") from the drm-intel tree and commit 8dfb1f0f8103 ("dma-buf: use
reservation objects") from the dma-buf tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/gpu/drm/i915/i915_gem_dmabuf.c
index 580aa42443ed,817ec444c976..000000000000
--- a/drivers/gpu/drm/i915/i915_gem_dmabuf.c
+++ b/drivers/gpu/drm/i915/i915_gem_dmabuf.c
@@@ -229,15 -233,8 +229,16 @@@ static const struct dma_buf_ops i915_dm
  struct dma_buf *i915_gem_prime_export(struct drm_device *dev,
  				      struct drm_gem_object *gem_obj, int flags)
  {
 +	struct drm_i915_gem_object *obj = to_intel_bo(gem_obj);
 +
 +	if (obj->ops->dmabuf_export) {
 +		int ret = obj->ops->dmabuf_export(obj);
 +		if (ret)
 +			return ERR_PTR(ret);
 +	}
 +
- 	return dma_buf_export(gem_obj, &i915_dmabuf_ops, gem_obj->size, flags);
+ 	return dma_buf_export(gem_obj, &i915_dmabuf_ops, gem_obj->size, flags,
+ 				NULL);
  }
  
  static int i915_gem_object_get_pages_dmabuf(struct drm_i915_gem_object *obj)

Attachment: signature.asc
Description: PGP signature