[PATCH linux-next] DRM: Armada: update dma_buf_export use

[PATCH linux-next] DRM: Armada: update dma_buf_export use

[Vincent Stehlé]

The dma_buf_export function was updated in commit 4bcec44ffaf9 'dma-buf: use
reservation objects' to take a reservation object parameter; update Armada
export method accordingly.

This fixes the following compilation error:

  drivers/gpu/drm/armada/armada_gem.c: In function ‘armada_gem_prime_export’:
  drivers/gpu/drm/armada/armada_gem.c:544:16: error: macro "dma_buf_export" requires 5 arguments, but only 4 given

Signed-off-by: Vincent Stehlé <vincent.stehle@laposte.net>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: David Airlie <airlied@linux.ie>
Cc: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Cc: Sumit Semwal <sumit.semwal@linaro.org>
---

Hi,

This can be seen with e.g. linux next-20140523 and arm allmodconfig.

Best regards,

V.

 drivers/gpu/drm/armada/armada_gem.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/armada/armada_gem.c b/drivers/gpu/drm/armada/armada_gem.c
index 887816f..7adb0c3 100644
--- a/drivers/gpu/drm/armada/armada_gem.c
+++ b/drivers/gpu/drm/armada/armada_gem.c
@@ -541,7 +541,7 @@ armada_gem_prime_export(struct drm_device *dev, struct drm_gem_object *obj,
 	int flags)
 {
 	return dma_buf_export(obj, &armada_gem_prime_dmabuf_ops, obj->size,
-			      O_RDWR);
+			      O_RDWR, NULL);
 }
 
 struct drm_gem_object *
-- 
2.0.0.rc2

Re: [PATCH linux-next] DRM: Armada: update dma_buf_export use

[David Herrmann]

Hi

On Sat, May 24, 2014 at 11:05 PM, Vincent Stehlé
<vincent.stehle@laposte.net> wrote:
> The dma_buf_export function was updated in commit 4bcec44ffaf9 'dma-buf: use
> reservation objects' to take a reservation object parameter; update Armada
> export method accordingly.
>
> This fixes the following compilation error:
>
>   drivers/gpu/drm/armada/armada_gem.c: In function ‘armada_gem_prime_export’:
>   drivers/gpu/drm/armada/armada_gem.c:544:16: error: macro "dma_buf_export" requires 5 arguments, but only 4 given
>
> Signed-off-by: Vincent Stehlé <vincent.stehle@laposte.net>
> Cc: Russell King <rmk+kernel@arm.linux.org.uk>
> Cc: David Airlie <airlied@linux.ie>
> Cc: Maarten Lankhorst <maarten.lankhorst@canonical.com>
> Cc: Sumit Semwal <sumit.semwal@linaro.org>

Reviewed-by: David Herrmann <dh.herrmann@gmail.com>

Thanks
David

> ---
>
> Hi,
>
> This can be seen with e.g. linux next-20140523 and arm allmodconfig.
>
> Best regards,
>
> V.
>
>  drivers/gpu/drm/armada/armada_gem.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/armada/armada_gem.c b/drivers/gpu/drm/armada/armada_gem.c
> index 887816f..7adb0c3 100644
> --- a/drivers/gpu/drm/armada/armada_gem.c
> +++ b/drivers/gpu/drm/armada/armada_gem.c
> @@ -541,7 +541,7 @@ armada_gem_prime_export(struct drm_device *dev, struct drm_gem_object *obj,
>         int flags)
>  {
>         return dma_buf_export(obj, &armada_gem_prime_dmabuf_ops, obj->size,
> -                             O_RDWR);
> +                             O_RDWR, NULL);
>  }
>
>  struct drm_gem_object *
> --
> 2.0.0.rc2
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH linux-next] DRM: Armada: update dma_buf_export use

[Russell King - ARM Linux]

On Sun, May 25, 2014 at 02:08:48PM +0200, David Herrmann wrote:
> Hi
> 
> On Sat, May 24, 2014 at 11:05 PM, Vincent Stehlé
> <vincent.stehle@laposte.net> wrote:
> > The dma_buf_export function was updated in commit 4bcec44ffaf9 'dma-buf: use
> > reservation objects' to take a reservation object parameter; update Armada
> > export method accordingly.
> >
> > This fixes the following compilation error:
> >
> >   drivers/gpu/drm/armada/armada_gem.c: In function ‘armada_gem_prime_export’:
> >   drivers/gpu/drm/armada/armada_gem.c:544:16: error: macro "dma_buf_export" requires 5 arguments, but only 4 given
> >
> > Signed-off-by: Vincent Stehlé <vincent.stehle@laposte.net>
> > Cc: Russell King <rmk+kernel@arm.linux.org.uk>
> > Cc: David Airlie <airlied@linux.ie>
> > Cc: Maarten Lankhorst <maarten.lankhorst@canonical.com>
> > Cc: Sumit Semwal <sumit.semwal@linaro.org>
> 
> Reviewed-by: David Herrmann <dh.herrmann@gmail.com>

Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>

Airlied, can you merge this please?  Thanks.

> Thanks
> David
> 
> > ---
> >
> > Hi,
> >
> > This can be seen with e.g. linux next-20140523 and arm allmodconfig.
> >
> > Best regards,
> >
> > V.
> >
> >  drivers/gpu/drm/armada/armada_gem.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/armada/armada_gem.c b/drivers/gpu/drm/armada/armada_gem.c
> > index 887816f..7adb0c3 100644
> > --- a/drivers/gpu/drm/armada/armada_gem.c
> > +++ b/drivers/gpu/drm/armada/armada_gem.c
> > @@ -541,7 +541,7 @@ armada_gem_prime_export(struct drm_device *dev, struct drm_gem_object *obj,
> >         int flags)
> >  {
> >         return dma_buf_export(obj, &armada_gem_prime_dmabuf_ops, obj->size,
> > -                             O_RDWR);
> > +                             O_RDWR, NULL);
> >  }
> >
> >  struct drm_gem_object *
> > --
> > 2.0.0.rc2
> >
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at  http://vger.kernel.org/majordomo-info.html
> > Please read the FAQ at  http://www.tux.org/lkml/

-- 
FTTC broadband for 0.8mile line: now at 9.7Mbps down 460kbps up... slowly
improving, and getting towards what was expected from it.
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH linux-next] DRM: Armada: update dma_buf_export use

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2300 bytes --]

Hi all,

On Sun, 25 May 2014 23:54:35 +0100 Russell King - ARM Linux <linux@arm.linux.org.uk> wrote:
>
> On Sun, May 25, 2014 at 02:08:48PM +0200, David Herrmann wrote:
> > 
> > On Sat, May 24, 2014 at 11:05 PM, Vincent Stehlé
> > <vincent.stehle@laposte.net> wrote:
> > > The dma_buf_export function was updated in commit 4bcec44ffaf9 'dma-buf: use
> > > reservation objects' to take a reservation object parameter; update Armada
> > > export method accordingly.
> > >
> > > This fixes the following compilation error:
> > >
> > >   drivers/gpu/drm/armada/armada_gem.c: In function ‘armada_gem_prime_export’:
> > >   drivers/gpu/drm/armada/armada_gem.c:544:16: error: macro "dma_buf_export" requires 5 arguments, but only 4 given
> > >
> > > Signed-off-by: Vincent Stehlé <vincent.stehle@laposte.net>
> > > Cc: Russell King <rmk+kernel@arm.linux.org.uk>
> > > Cc: David Airlie <airlied@linux.ie>
> > > Cc: Maarten Lankhorst <maarten.lankhorst@canonical.com>
> > > Cc: Sumit Semwal <sumit.semwal@linaro.org>
> > 
> > Reviewed-by: David Herrmann <dh.herrmann@gmail.com>
> 
> Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
> 
> Airlied, can you merge this please?  Thanks.

Except that commit 4bcec44ffaf9 'dma-buf: use reservation objects'
comes from the dma-buf tree, so Sumit needs to add this commit to his
tree.

> > > This can be seen with e.g. linux next-20140523 and arm allmodconfig.
> > >
> > > Best regards,
> > >
> > > V.
> > >
> > >  drivers/gpu/drm/armada/armada_gem.c | 2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/drivers/gpu/drm/armada/armada_gem.c b/drivers/gpu/drm/armada/armada_gem.c
> > > index 887816f..7adb0c3 100644
> > > --- a/drivers/gpu/drm/armada/armada_gem.c
> > > +++ b/drivers/gpu/drm/armada/armada_gem.c
> > > @@ -541,7 +541,7 @@ armada_gem_prime_export(struct drm_device *dev, struct drm_gem_object *obj,
> > >         int flags)
> > >  {
> > >         return dma_buf_export(obj, &armada_gem_prime_dmabuf_ops, obj->size,
> > > -                             O_RDWR);
> > > +                             O_RDWR, NULL);
> > >  }
> > >
> > >  struct drm_gem_object *
> > > --
> > > 2.0.0.rc2

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH linux-next] DRM: Armada: update dma_buf_export use

[Dave Airlie]

On 26 May 2014 09:06, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> On Sun, 25 May 2014 23:54:35 +0100 Russell King - ARM Linux <linux@arm.linux.org.uk> wrote:
>>
>> On Sun, May 25, 2014 at 02:08:48PM +0200, David Herrmann wrote:
>> >
>> > On Sat, May 24, 2014 at 11:05 PM, Vincent Stehlé
>> > <vincent.stehle@laposte.net> wrote:
>> > > The dma_buf_export function was updated in commit 4bcec44ffaf9 'dma-buf: use
>> > > reservation objects' to take a reservation object parameter; update Armada
>> > > export method accordingly.
>> > >
>> > > This fixes the following compilation error:
>> > >
>> > >   drivers/gpu/drm/armada/armada_gem.c: In function ‘armada_gem_prime_export’:
>> > >   drivers/gpu/drm/armada/armada_gem.c:544:16: error: macro "dma_buf_export" requires 5 arguments, but only 4 given
>> > >
>> > > Signed-off-by: Vincent Stehlé <vincent.stehle@laposte.net>
>> > > Cc: Russell King <rmk+kernel@arm.linux.org.uk>
>> > > Cc: David Airlie <airlied@linux.ie>
>> > > Cc: Maarten Lankhorst <maarten.lankhorst@canonical.com>
>> > > Cc: Sumit Semwal <sumit.semwal@linaro.org>
>> >
>> > Reviewed-by: David Herrmann <dh.herrmann@gmail.com>
>>
>> Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
>>
>> Airlied, can you merge this please?  Thanks.
>
> Except that commit 4bcec44ffaf9 'dma-buf: use reservation objects'
> comes from the dma-buf tree, so Sumit needs to add this commit to his
> tree.
>

Then we should cc him.

Dave.
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH linux-next] DRM: Armada: update dma_buf_export use

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 284 bytes --]

Hi Dave,

On Tue, 27 May 2014 15:52:46 +1000 Dave Airlie <airlied@gmail.com> wrote:
>
> Then we should cc him.

He was cc'd on my email that you replied to ...

But I guess the extra prod won't hurt :-)
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH linux-next] DRM: Armada: update dma_buf_export use

[Sumit Semwal]

On 27 May 2014 11:52, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Dave,
>
> On Tue, 27 May 2014 15:52:46 +1000 Dave Airlie <airlied@gmail.com> wrote:
>>
>> Then we should cc him.
>
> He was cc'd on my email that you replied to ...
>
> But I guess the extra prod won't hurt :-)
:) thanks for the prod Stephen!

All,

I'll merge it in today's for-next for me.

> --
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au

-- 
Thanks and regards,

Sumit Semwal
Graphics Engineer - Graphics working group
Linaro.org │ Open source software for ARM SoCs
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel