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@xxxxxxxxxxx> 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@xxxxxxxxxxx>
> > Cc: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
> > Cc: David Airlie <airlied@xxxxxxxx>
> > Cc: Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxx>
> > Cc: Sumit Semwal <sumit.semwal@xxxxxxxxxx>
> 
> Reviewed-by: David Herrmann <dh.herrmann@xxxxxxxxx>

Acked-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

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@xxxxxxxxxxxxxxx
> > 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.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/