| Message ID | 20191118103536.17675-6-daniel.vetter@ffwll.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Retire dma_buf_k(un)map | expand |
On Mon, Nov 18, 2019 at 11:35:26AM +0100, Daniel Vetter wrote: > It's a dummy anyway. > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > Cc: Russell King <linux@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. -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 >
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.vetter@intel.com> > > Cc: Russell King <linux@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+kernel@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 >
On Tue, Nov 26, 2019 at 1:35 AM Russell King - ARM Linux admin <linux@armlinux.org.uk> wrote: > 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.vetter@intel.com> > > > Cc: Russell King <linux@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+kernel@armlinux.org.uk> Thanks for taking a look. > I thought drm trees closed around -rc6? drm.git closes for pull request. But drm-misc is open all the time, so that committers can push patches whenever the patches are ready, instead of having to remember that there's something in the queue. The script used for drm-misc pushes then makes sure that drm-misc-next doesn't show up in linux-next until after -rc1. So this is all going into 5.6. -Daniel > > > -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
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, };
It's a dummy anyway. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Cc: Russell King <linux@armlinux.org.uk> --- drivers/gpu/drm/armada/armada_gem.c | 12 ------------ 1 file changed, 12 deletions(-)