| Message ID | 20191118103536.17675-5-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:25AM +0100, Daniel Vetter wrote: > There's no callers in-tree anymore. > > For merging probably best to stuff this into drm-misc, since that's > where the dma-buf heaps will land too. And the resulting conflict > hopefully ensures that dma-buf heaps wont have a new ->kmap/unmap > implemenation. > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > Cc: Laura Abbott <labbott@redhat.com> > Cc: Sumit Semwal <sumit.semwal@linaro.org> > Cc: devel@driverdev.osuosl.org > Cc: linaro-mm-sig@lists.linaro.org > --- > drivers/staging/android/ion/ion.c | 14 -------------- > 1 file changed, 14 deletions(-) Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
On 11/18/19 5:35 AM, Daniel Vetter wrote: > There's no callers in-tree anymore. > > For merging probably best to stuff this into drm-misc, since that's > where the dma-buf heaps will land too. And the resulting conflict > hopefully ensures that dma-buf heaps wont have a new ->kmap/unmap > implemenation. > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > Cc: Laura Abbott <labbott@redhat.com> > Cc: Sumit Semwal <sumit.semwal@linaro.org> > Cc: devel@driverdev.osuosl.org > Cc: linaro-mm-sig@lists.linaro.org > --- > drivers/staging/android/ion/ion.c | 14 -------------- > 1 file changed, 14 deletions(-) > > diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c > index e6b1ca141b93..bb4ededc1150 100644 > --- a/drivers/staging/android/ion/ion.c > +++ b/drivers/staging/android/ion/ion.c > @@ -274,18 +274,6 @@ static void ion_dma_buf_release(struct dma_buf *dmabuf) > _ion_buffer_destroy(buffer); > } > > -static void *ion_dma_buf_kmap(struct dma_buf *dmabuf, unsigned long offset) > -{ > - struct ion_buffer *buffer = dmabuf->priv; > - > - return buffer->vaddr + offset * PAGE_SIZE; > -} > - > -static void ion_dma_buf_kunmap(struct dma_buf *dmabuf, unsigned long offset, > - void *ptr) > -{ > -} > - > static int ion_dma_buf_begin_cpu_access(struct dma_buf *dmabuf, > enum dma_data_direction direction) > { > @@ -349,8 +337,6 @@ static const struct dma_buf_ops dma_buf_ops = { > .detach = ion_dma_buf_detatch, > .begin_cpu_access = ion_dma_buf_begin_cpu_access, > .end_cpu_access = ion_dma_buf_end_cpu_access, > - .map = ion_dma_buf_kmap, > - .unmap = ion_dma_buf_kunmap, > }; > > static int ion_alloc(size_t len, unsigned int heap_id_mask, unsigned int flags) > Acked-by: Laura Abbott <labbott@redhat.com>
diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c index e6b1ca141b93..bb4ededc1150 100644 --- a/drivers/staging/android/ion/ion.c +++ b/drivers/staging/android/ion/ion.c @@ -274,18 +274,6 @@ static void ion_dma_buf_release(struct dma_buf *dmabuf) _ion_buffer_destroy(buffer); } -static void *ion_dma_buf_kmap(struct dma_buf *dmabuf, unsigned long offset) -{ - struct ion_buffer *buffer = dmabuf->priv; - - return buffer->vaddr + offset * PAGE_SIZE; -} - -static void ion_dma_buf_kunmap(struct dma_buf *dmabuf, unsigned long offset, - void *ptr) -{ -} - static int ion_dma_buf_begin_cpu_access(struct dma_buf *dmabuf, enum dma_data_direction direction) { @@ -349,8 +337,6 @@ static const struct dma_buf_ops dma_buf_ops = { .detach = ion_dma_buf_detatch, .begin_cpu_access = ion_dma_buf_begin_cpu_access, .end_cpu_access = ion_dma_buf_end_cpu_access, - .map = ion_dma_buf_kmap, - .unmap = ion_dma_buf_kunmap, }; static int ion_alloc(size_t len, unsigned int heap_id_mask, unsigned int flags)
There's no callers in-tree anymore. For merging probably best to stuff this into drm-misc, since that's where the dma-buf heaps will land too. And the resulting conflict hopefully ensures that dma-buf heaps wont have a new ->kmap/unmap implemenation. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Cc: Laura Abbott <labbott@redhat.com> Cc: Sumit Semwal <sumit.semwal@linaro.org> Cc: devel@driverdev.osuosl.org Cc: linaro-mm-sig@lists.linaro.org --- drivers/staging/android/ion/ion.c | 14 -------------- 1 file changed, 14 deletions(-)