On Mon, Nov 25, 2019 at 10:44:43PM +0100, Daniel Vetter wrote:
> On Mon, Nov 18, 2019 at 11:35:26AM +0100, Daniel Vetter wrote:
> > It's a dummy anyway.
> >
> > Signed-off-by: Daniel Vetter <daniel.vet...@intel.com>
> > Cc: Russell King <li...@armlinux.org.uk>
>
> I merged the entire series except this one and the final patch, sill
> waiting a bit more for an ack on this perhaps.
Acked-by: Russell King <rmk+ker...@armlinux.org.uk>
I thought drm trees closed around -rc6?
> -Daniel
>
> > ---
> > drivers/gpu/drm/armada/armada_gem.c | 12 ------------
> > 1 file changed, 12 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/armada/armada_gem.c
> > b/drivers/gpu/drm/armada/armada_gem.c
> > index 93cf8b8bfcff..976685f2939e 100644
> > --- a/drivers/gpu/drm/armada/armada_gem.c
> > +++ b/drivers/gpu/drm/armada/armada_gem.c
> > @@ -461,16 +461,6 @@ static void armada_gem_prime_unmap_dma_buf(struct
> > dma_buf_attachment *attach,
> > kfree(sgt);
> > }
> >
> > -static void *armada_gem_dmabuf_no_kmap(struct dma_buf *buf, unsigned long
> > n)
> > -{
> > - return NULL;
> > -}
> > -
> > -static void
> > -armada_gem_dmabuf_no_kunmap(struct dma_buf *buf, unsigned long n, void
> > *addr)
> > -{
> > -}
> > -
> > static int
> > armada_gem_dmabuf_mmap(struct dma_buf *buf, struct vm_area_struct *vma)
> > {
> > @@ -481,8 +471,6 @@ static const struct dma_buf_ops
> > armada_gem_prime_dmabuf_ops = {
> > .map_dma_buf = armada_gem_prime_map_dma_buf,
> > .unmap_dma_buf = armada_gem_prime_unmap_dma_buf,
> > .release = drm_gem_dmabuf_release,
> > - .map = armada_gem_dmabuf_no_kmap,
> > - .unmap = armada_gem_dmabuf_no_kunmap,
> > .mmap = armada_gem_dmabuf_mmap,
> > };
> >
> > --
> > 2.24.0
> >
>
> --
> Daniel Vetter
> Software Engineer, Intel Corporation
> http://blog.ffwll.ch
>
--
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTC broadband for 0.8mile line in suburbia: sync at 12.1Mbps down 622kbps up
According to speedtest.net: 11.9Mbps down 500kbps up
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
