Hi all, On Sun, 25 May 2014 23:54:35 +0100 Russell King - ARM Linux <[email protected]> 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é > > <[email protected]> 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é <[email protected]> > > > Cc: Russell King <[email protected]> > > > Cc: David Airlie <[email protected]> > > > Cc: Maarten Lankhorst <[email protected]> > > > Cc: Sumit Semwal <[email protected]> > > > > Reviewed-by: David Herrmann <[email protected]> > > Acked-by: Russell King <[email protected]> > > 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 [email protected]
signature.asc
Description: PGP signature
