* linux-next: manual merge of the dma-buf tree with the drm-intel tree
@ 2014-05-20 6:55 Stephen Rothwell
2014-05-20 8:05 ` Sumit Semwal
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2014-05-20 6:55 UTC (permalink / raw)
To: Sumit Semwal, Daniel Vetter, intel-gfx, dri-devel
Cc: Maarten Lankhorst, linux-next, linux-kernel
[-- Attachment #1.1: Type: text/plain, Size: 1338 bytes --]
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@canb•auug.org.au
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 #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
[-- Attachment #2: Type: text/plain, Size: 159 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists•freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: linux-next: manual merge of the dma-buf tree with the drm-intel tree
2014-05-20 6:55 linux-next: manual merge of the dma-buf tree with the drm-intel tree Stephen Rothwell
@ 2014-05-20 8:05 ` Sumit Semwal
0 siblings, 0 replies; 2+ messages in thread
From: Sumit Semwal @ 2014-05-20 8:05 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Daniel Vetter, intel-gfx, DRI mailing list, linux-next, LKML,
Maarten Lankhorst, Chris Wilson
On 20 May 2014 12:25, Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> 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).
>
Hi Stephen!
This seems good, thanks!
Best regards,
~Sumit.
> --
> Cheers,
> Stephen Rothwell sfr@canb•auug.org.au
>
> 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)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-05-20 8:05 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-20 6:55 linux-next: manual merge of the dma-buf tree with the drm-intel tree Stephen Rothwell
2014-05-20 8:05 ` Sumit Semwal
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox