From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.3 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1A86FC4338F for ; Tue, 3 Aug 2021 08:09:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 00FA760F11 for ; Tue, 3 Aug 2021 08:09:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234476AbhHCIJv (ORCPT ); Tue, 3 Aug 2021 04:09:51 -0400 Received: from lb2-smtp-cloud8.xs4all.net ([194.109.24.25]:57953 "EHLO lb2-smtp-cloud8.xs4all.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234469AbhHCIJW (ORCPT ); Tue, 3 Aug 2021 04:09:22 -0400 Received: from cust-b5b5937f ([IPv6:fc0c:c16d:66b8:757f:c639:739b:9d66:799d]) by smtp-cloud8.xs4all.net with ESMTPA id ApTkmT1aXXTlcApTlmkLBj; Tue, 03 Aug 2021 10:08:50 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xs4all.nl; s=s2; t=1627978130; bh=Xp+dbHvICKIDl1fW5D2wPU1zyeJa04JcHVORs/BlJaw=; h=Subject:To:From:Message-ID:Date:MIME-Version:Content-Type:From: Subject; b=GRVrKkTEZ5iv9C/RvV1gwxfGSBGuMd9pAk+Q58vKrgdLJavbGBRsPrHSsKuSD6Ibz Lqn4s8TJM2P+Slurba6A0J13kuUOLM0pw676DuhhF8nxO6hqI85XS4lvI7fZe1P0k2 GSzazGVVRiRsLO6G/2MjtD8dhqwxQyHwv+xUfBGvWIhGTv6JH2SKVhIlsQ4SuX9vue R5OV7zTCsKGLXCN3kAZA2GhJUWxOriFuZxWnwun29QqIoibqpWCHwPn40u+eI/uCol arePjlqjHGK6PfcwlQm4qZJ9P2SvrG4BvXnz0cMUz2KPhml+4oHVdbbzh49WvfWEuq pdB6Ix3NXogAA== Subject: Re: [PATCHv4 1/8] videobuf2: rework vb2_mem_ops API To: Sergey Senozhatsky , Tomasz Figa Cc: Dafna Hirschfeld , Ricardo Ribalda , Christoph Hellwig , Mauro Carvalho Chehab , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org References: <20210727070517.443167-1-senozhatsky@chromium.org> <20210727070517.443167-2-senozhatsky@chromium.org> From: Hans Verkuil Message-ID: <3744c521-ce07-4ca9-5f57-fa42b917d53c@xs4all.nl> Date: Tue, 3 Aug 2021 10:08:48 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <20210727070517.443167-2-senozhatsky@chromium.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-CMAE-Envelope: MS4xfM/sAtWP6ttd+CI2Ql9GoTHBbBUZhqQ7m+A8J85fN6eSPeI0rkWEEM3wpyguwAwJsomHndfzqT2oQwO+15Fs0ROdjIvHFeAGuwLQ0gfjwG7z+RJ7kKd4 HtgL2vggmWCDQ+L8Wj3tpiUmBnr9zwxVdUwB99WJIpzGxyUTcUeg7SJLHDBMkOo0mPhTven1aO3PhCiPJR5svVPZZC1KUUQLExMSePz37C6MtFuMzXJosMlb FQzazTGp7bxfJbLSpPWXUm3XucWAaYM0lkDok0YEmhJkvH1998c52Z108TiFt0enr65bodbtawm6u7zVpRxStDu0u7ucRmKfTaCkqVwPRBLLIrU/pFZTDQG7 4QC9GFWeQYec7duwlZpdizcIOYkM6lD2rBR6ig9uc6L+7Snx/NFfzG+AyHaOXNlUSplIR+PeSsrMsUACsrNTkG6g56ju/cDyos1iRLBnALPk83W27H8h1GJu 1GT9JQqknCzCyf4NPuQEURVaoA5eC2/UMsaTU2VOjwd8n30J3X8i0lBMkpmzoxperCTql5mOwWbGPbTa Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 27/07/2021 09:05, Sergey Senozhatsky wrote: Sprinkle a few more 'the's in the text: > With new DMA API we need an extension of videobuf2 API. Previously, With -> With the of -> of the > videobuf2 core would set non-coherent DMA bit in vb2 queue dma_attr videobuf2 -> the videobuf2 set -> set the in vb2 queue dma_attr -> in the vb2_queue dma_attr field > (if user-space would pass a corresponding memory hint); vb2 core vb2 core -> the vb2 core > then would pass the vb2 queue dma_attrs to the vb2 allocators. vb2 queue -> vb2_queue > vb2 allocator would use queue's dma_attr and DMA API would allocate vb2 -> The vb2 queue's -> the queue's DMA API -> the DMA API > either coherent or non-coherent memory. > > But we cannot do this anymore, since there is no corresponding DMA > attr flag and, hence, there is no way for the allocator to become > aware of what type of allocation user-space has requested. So we > need to pass more context from videobuf2 core to the allocators. > > Fix this by changing call_ptr_memop() macro to pass vb2 pointer to changing -> changing the vb2 pointer to -> the vb2 pointer to the > corresponding op callbacks. Regards, Hans > > Signed-off-by: Sergey Senozhatsky > --- > .../media/common/videobuf2/videobuf2-core.c | 42 +++++++++++-------- > .../common/videobuf2/videobuf2-dma-contig.c | 36 +++++++++------- > .../media/common/videobuf2/videobuf2-dma-sg.c | 33 ++++++++------- > .../common/videobuf2/videobuf2-vmalloc.c | 30 ++++++------- > include/media/videobuf2-core.h | 37 ++++++++-------- > 5 files changed, 98 insertions(+), 80 deletions(-) > > diff --git a/drivers/media/common/videobuf2/videobuf2-core.c b/drivers/media/common/videobuf2/videobuf2-core.c > index 02281d13505f..9a5cc3e63439 100644 > --- a/drivers/media/common/videobuf2/videobuf2-core.c > +++ b/drivers/media/common/videobuf2/videobuf2-core.c > @@ -68,13 +68,13 @@ module_param(debug, int, 0644); > err; \ > }) > > -#define call_ptr_memop(vb, op, args...) \ > +#define call_ptr_memop(op, vb, args...) \ > ({ \ > struct vb2_queue *_q = (vb)->vb2_queue; \ > void *ptr; \ > \ > log_memop(vb, op); \ > - ptr = _q->mem_ops->op ? _q->mem_ops->op(args) : NULL; \ > + ptr = _q->mem_ops->op ? _q->mem_ops->op(vb, args) : NULL; \ > if (!IS_ERR_OR_NULL(ptr)) \ > (vb)->cnt_mem_ ## op++; \ > ptr; \ > @@ -144,9 +144,9 @@ module_param(debug, int, 0644); > ((vb)->vb2_queue->mem_ops->op ? \ > (vb)->vb2_queue->mem_ops->op(args) : 0) > > -#define call_ptr_memop(vb, op, args...) \ > +#define call_ptr_memop(op, vb, args...) \ > ((vb)->vb2_queue->mem_ops->op ? \ > - (vb)->vb2_queue->mem_ops->op(args) : NULL) > + (vb)->vb2_queue->mem_ops->op(vb, args) : NULL) > > #define call_void_memop(vb, op, args...) \ > do { \ > @@ -230,9 +230,10 @@ static int __vb2_buf_mem_alloc(struct vb2_buffer *vb) > if (size < vb->planes[plane].length) > goto free; > > - mem_priv = call_ptr_memop(vb, alloc, > - q->alloc_devs[plane] ? : q->dev, > - q->dma_attrs, size, q->dma_dir, q->gfp_flags); > + mem_priv = call_ptr_memop(alloc, > + vb, > + q->alloc_devs[plane] ? : q->dev, > + size); > if (IS_ERR_OR_NULL(mem_priv)) { > if (mem_priv) > ret = PTR_ERR(mem_priv); > @@ -975,7 +976,7 @@ void *vb2_plane_vaddr(struct vb2_buffer *vb, unsigned int plane_no) > if (plane_no >= vb->num_planes || !vb->planes[plane_no].mem_priv) > return NULL; > > - return call_ptr_memop(vb, vaddr, vb->planes[plane_no].mem_priv); > + return call_ptr_memop(vaddr, vb, vb->planes[plane_no].mem_priv); > > } > EXPORT_SYMBOL_GPL(vb2_plane_vaddr); > @@ -985,7 +986,7 @@ void *vb2_plane_cookie(struct vb2_buffer *vb, unsigned int plane_no) > if (plane_no >= vb->num_planes || !vb->planes[plane_no].mem_priv) > return NULL; > > - return call_ptr_memop(vb, cookie, vb->planes[plane_no].mem_priv); > + return call_ptr_memop(cookie, vb, vb->planes[plane_no].mem_priv); > } > EXPORT_SYMBOL_GPL(vb2_plane_cookie); > > @@ -1125,10 +1126,11 @@ static int __prepare_userptr(struct vb2_buffer *vb) > vb->planes[plane].data_offset = 0; > > /* Acquire each plane's memory */ > - mem_priv = call_ptr_memop(vb, get_userptr, > - q->alloc_devs[plane] ? : q->dev, > - planes[plane].m.userptr, > - planes[plane].length, q->dma_dir); > + mem_priv = call_ptr_memop(get_userptr, > + vb, > + q->alloc_devs[plane] ? : q->dev, > + planes[plane].m.userptr, > + planes[plane].length); > if (IS_ERR(mem_priv)) { > dprintk(q, 1, "failed acquiring userspace memory for plane %d\n", > plane); > @@ -1249,9 +1251,11 @@ static int __prepare_dmabuf(struct vb2_buffer *vb) > vb->planes[plane].data_offset = 0; > > /* Acquire each plane's memory */ > - mem_priv = call_ptr_memop(vb, attach_dmabuf, > - q->alloc_devs[plane] ? : q->dev, > - dbuf, planes[plane].length, q->dma_dir); > + mem_priv = call_ptr_memop(attach_dmabuf, > + vb, > + q->alloc_devs[plane] ? : q->dev, > + dbuf, > + planes[plane].length); > if (IS_ERR(mem_priv)) { > dprintk(q, 1, "failed to attach dmabuf\n"); > ret = PTR_ERR(mem_priv); > @@ -2176,8 +2180,10 @@ int vb2_core_expbuf(struct vb2_queue *q, int *fd, unsigned int type, > > vb_plane = &vb->planes[plane]; > > - dbuf = call_ptr_memop(vb, get_dmabuf, vb_plane->mem_priv, > - flags & O_ACCMODE); > + dbuf = call_ptr_memop(get_dmabuf, > + vb, > + vb_plane->mem_priv, > + flags & O_ACCMODE); > if (IS_ERR_OR_NULL(dbuf)) { > dprintk(q, 1, "failed to export buffer %d, plane %d\n", > index, plane); > diff --git a/drivers/media/common/videobuf2/videobuf2-dma-contig.c b/drivers/media/common/videobuf2/videobuf2-dma-contig.c > index a7f61ba85440..019c3843dc6d 100644 > --- a/drivers/media/common/videobuf2/videobuf2-dma-contig.c > +++ b/drivers/media/common/videobuf2/videobuf2-dma-contig.c > @@ -40,6 +40,8 @@ struct vb2_dc_buf { > > /* DMABUF related */ > struct dma_buf_attachment *db_attach; > + > + struct vb2_buffer *vb; > }; > > /*********************************************/ > @@ -66,14 +68,14 @@ static unsigned long vb2_dc_get_contiguous_size(struct sg_table *sgt) > /* callbacks for all buffers */ > /*********************************************/ > > -static void *vb2_dc_cookie(void *buf_priv) > +static void *vb2_dc_cookie(struct vb2_buffer *vb, void *buf_priv) > { > struct vb2_dc_buf *buf = buf_priv; > > return &buf->dma_addr; > } > > -static void *vb2_dc_vaddr(void *buf_priv) > +static void *vb2_dc_vaddr(struct vb2_buffer *vb, void *buf_priv) > { > struct vb2_dc_buf *buf = buf_priv; > struct dma_buf_map map; > @@ -137,9 +139,9 @@ static void vb2_dc_put(void *buf_priv) > kfree(buf); > } > > -static void *vb2_dc_alloc(struct device *dev, unsigned long attrs, > - unsigned long size, enum dma_data_direction dma_dir, > - gfp_t gfp_flags) > +static void *vb2_dc_alloc(struct vb2_buffer *vb, > + struct device *dev, > + unsigned long size) > { > struct vb2_dc_buf *buf; > > @@ -150,9 +152,10 @@ static void *vb2_dc_alloc(struct device *dev, unsigned long attrs, > if (!buf) > return ERR_PTR(-ENOMEM); > > - buf->attrs = attrs; > + buf->attrs = vb->vb2_queue->dma_attrs; > buf->cookie = dma_alloc_attrs(dev, size, &buf->dma_addr, > - GFP_KERNEL | gfp_flags, buf->attrs); > + GFP_KERNEL | vb->vb2_queue->gfp_flags, > + buf->attrs); > if (!buf->cookie) { > dev_err(dev, "dma_alloc_coherent of size %ld failed\n", size); > kfree(buf); > @@ -165,11 +168,12 @@ static void *vb2_dc_alloc(struct device *dev, unsigned long attrs, > /* Prevent the device from being released while the buffer is used */ > buf->dev = get_device(dev); > buf->size = size; > - buf->dma_dir = dma_dir; > + buf->dma_dir = vb->vb2_queue->dma_dir; > > buf->handler.refcount = &buf->refcount; > buf->handler.put = vb2_dc_put; > buf->handler.arg = buf; > + buf->vb = vb; > > refcount_set(&buf->refcount, 1); > > @@ -397,7 +401,9 @@ static struct sg_table *vb2_dc_get_base_sgt(struct vb2_dc_buf *buf) > return sgt; > } > > -static struct dma_buf *vb2_dc_get_dmabuf(void *buf_priv, unsigned long flags) > +static struct dma_buf *vb2_dc_get_dmabuf(struct vb2_buffer *vb, > + void *buf_priv, > + unsigned long flags) > { > struct vb2_dc_buf *buf = buf_priv; > struct dma_buf *dbuf; > @@ -459,8 +465,8 @@ static void vb2_dc_put_userptr(void *buf_priv) > kfree(buf); > } > > -static void *vb2_dc_get_userptr(struct device *dev, unsigned long vaddr, > - unsigned long size, enum dma_data_direction dma_dir) > +static void *vb2_dc_get_userptr(struct vb2_buffer *vb, struct device *dev, > + unsigned long vaddr, unsigned long size) > { > struct vb2_dc_buf *buf; > struct frame_vector *vec; > @@ -490,7 +496,7 @@ static void *vb2_dc_get_userptr(struct device *dev, unsigned long vaddr, > return ERR_PTR(-ENOMEM); > > buf->dev = dev; > - buf->dma_dir = dma_dir; > + buf->dma_dir = vb->vb2_queue->dma_dir; > > offset = lower_32_bits(offset_in_page(vaddr)); > vec = vb2_create_framevec(vaddr, size); > @@ -660,8 +666,8 @@ static void vb2_dc_detach_dmabuf(void *mem_priv) > kfree(buf); > } > > -static void *vb2_dc_attach_dmabuf(struct device *dev, struct dma_buf *dbuf, > - unsigned long size, enum dma_data_direction dma_dir) > +static void *vb2_dc_attach_dmabuf(struct vb2_buffer *vb, struct device *dev, > + struct dma_buf *dbuf, unsigned long size) > { > struct vb2_dc_buf *buf; > struct dma_buf_attachment *dba; > @@ -685,7 +691,7 @@ static void *vb2_dc_attach_dmabuf(struct device *dev, struct dma_buf *dbuf, > return dba; > } > > - buf->dma_dir = dma_dir; > + buf->dma_dir = vb->vb2_queue->dma_dir; > buf->size = size; > buf->db_attach = dba; > > diff --git a/drivers/media/common/videobuf2/videobuf2-dma-sg.c b/drivers/media/common/videobuf2/videobuf2-dma-sg.c > index c5b06a509566..50265080cfc8 100644 > --- a/drivers/media/common/videobuf2/videobuf2-dma-sg.c > +++ b/drivers/media/common/videobuf2/videobuf2-dma-sg.c > @@ -51,6 +51,8 @@ struct vb2_dma_sg_buf { > struct vb2_vmarea_handler handler; > > struct dma_buf_attachment *db_attach; > + > + struct vb2_buffer *vb; > }; > > static void vb2_dma_sg_put(void *buf_priv); > @@ -96,9 +98,8 @@ static int vb2_dma_sg_alloc_compacted(struct vb2_dma_sg_buf *buf, > return 0; > } > > -static void *vb2_dma_sg_alloc(struct device *dev, unsigned long dma_attrs, > - unsigned long size, enum dma_data_direction dma_dir, > - gfp_t gfp_flags) > +static void *vb2_dma_sg_alloc(struct vb2_buffer *vb, struct device *dev, > + unsigned long size) > { > struct vb2_dma_sg_buf *buf; > struct sg_table *sgt; > @@ -113,7 +114,7 @@ static void *vb2_dma_sg_alloc(struct device *dev, unsigned long dma_attrs, > return ERR_PTR(-ENOMEM); > > buf->vaddr = NULL; > - buf->dma_dir = dma_dir; > + buf->dma_dir = vb->vb2_queue->dma_dir; > buf->offset = 0; > buf->size = size; > /* size is already page aligned */ > @@ -130,7 +131,7 @@ static void *vb2_dma_sg_alloc(struct device *dev, unsigned long dma_attrs, > if (!buf->pages) > goto fail_pages_array_alloc; > > - ret = vb2_dma_sg_alloc_compacted(buf, gfp_flags); > + ret = vb2_dma_sg_alloc_compacted(buf, vb->vb2_queue->gfp_flags); > if (ret) > goto fail_pages_alloc; > > @@ -154,6 +155,7 @@ static void *vb2_dma_sg_alloc(struct device *dev, unsigned long dma_attrs, > buf->handler.refcount = &buf->refcount; > buf->handler.put = vb2_dma_sg_put; > buf->handler.arg = buf; > + buf->vb = vb; > > refcount_set(&buf->refcount, 1); > > @@ -213,9 +215,8 @@ static void vb2_dma_sg_finish(void *buf_priv) > dma_sync_sgtable_for_cpu(buf->dev, sgt, buf->dma_dir); > } > > -static void *vb2_dma_sg_get_userptr(struct device *dev, unsigned long vaddr, > - unsigned long size, > - enum dma_data_direction dma_dir) > +static void *vb2_dma_sg_get_userptr(struct vb2_buffer *vb, struct device *dev, > + unsigned long vaddr, unsigned long size) > { > struct vb2_dma_sg_buf *buf; > struct sg_table *sgt; > @@ -230,7 +231,7 @@ static void *vb2_dma_sg_get_userptr(struct device *dev, unsigned long vaddr, > > buf->vaddr = NULL; > buf->dev = dev; > - buf->dma_dir = dma_dir; > + buf->dma_dir = vb->vb2_queue->dma_dir; > buf->offset = vaddr & ~PAGE_MASK; > buf->size = size; > buf->dma_sgt = &buf->sg_table; > @@ -292,7 +293,7 @@ static void vb2_dma_sg_put_userptr(void *buf_priv) > kfree(buf); > } > > -static void *vb2_dma_sg_vaddr(void *buf_priv) > +static void *vb2_dma_sg_vaddr(struct vb2_buffer *vb, void *buf_priv) > { > struct vb2_dma_sg_buf *buf = buf_priv; > struct dma_buf_map map; > @@ -511,7 +512,9 @@ static const struct dma_buf_ops vb2_dma_sg_dmabuf_ops = { > .release = vb2_dma_sg_dmabuf_ops_release, > }; > > -static struct dma_buf *vb2_dma_sg_get_dmabuf(void *buf_priv, unsigned long flags) > +static struct dma_buf *vb2_dma_sg_get_dmabuf(struct vb2_buffer *vb, > + void *buf_priv, > + unsigned long flags) > { > struct vb2_dma_sg_buf *buf = buf_priv; > struct dma_buf *dbuf; > @@ -605,8 +608,8 @@ static void vb2_dma_sg_detach_dmabuf(void *mem_priv) > kfree(buf); > } > > -static void *vb2_dma_sg_attach_dmabuf(struct device *dev, struct dma_buf *dbuf, > - unsigned long size, enum dma_data_direction dma_dir) > +static void *vb2_dma_sg_attach_dmabuf(struct vb2_buffer *vb, struct device *dev, > + struct dma_buf *dbuf, unsigned long size) > { > struct vb2_dma_sg_buf *buf; > struct dma_buf_attachment *dba; > @@ -630,14 +633,14 @@ static void *vb2_dma_sg_attach_dmabuf(struct device *dev, struct dma_buf *dbuf, > return dba; > } > > - buf->dma_dir = dma_dir; > + buf->dma_dir = vb->vb2_queue->dma_dir; > buf->size = size; > buf->db_attach = dba; > > return buf; > } > > -static void *vb2_dma_sg_cookie(void *buf_priv) > +static void *vb2_dma_sg_cookie(struct vb2_buffer *vb, void *buf_priv) > { > struct vb2_dma_sg_buf *buf = buf_priv; > > diff --git a/drivers/media/common/videobuf2/videobuf2-vmalloc.c b/drivers/media/common/videobuf2/videobuf2-vmalloc.c > index 83f95258ec8c..ef36abd912dc 100644 > --- a/drivers/media/common/videobuf2/videobuf2-vmalloc.c > +++ b/drivers/media/common/videobuf2/videobuf2-vmalloc.c > @@ -34,13 +34,12 @@ struct vb2_vmalloc_buf { > > static void vb2_vmalloc_put(void *buf_priv); > > -static void *vb2_vmalloc_alloc(struct device *dev, unsigned long attrs, > - unsigned long size, enum dma_data_direction dma_dir, > - gfp_t gfp_flags) > +static void *vb2_vmalloc_alloc(struct vb2_buffer *vb, struct device *dev, > + unsigned long size) > { > struct vb2_vmalloc_buf *buf; > > - buf = kzalloc(sizeof(*buf), GFP_KERNEL | gfp_flags); > + buf = kzalloc(sizeof(*buf), GFP_KERNEL | vb->vb2_queue->gfp_flags); > if (!buf) > return ERR_PTR(-ENOMEM); > > @@ -52,7 +51,7 @@ static void *vb2_vmalloc_alloc(struct device *dev, unsigned long attrs, > return ERR_PTR(-ENOMEM); > } > > - buf->dma_dir = dma_dir; > + buf->dma_dir = vb->vb2_queue->dma_dir; > buf->handler.refcount = &buf->refcount; > buf->handler.put = vb2_vmalloc_put; > buf->handler.arg = buf; > @@ -71,9 +70,8 @@ static void vb2_vmalloc_put(void *buf_priv) > } > } > > -static void *vb2_vmalloc_get_userptr(struct device *dev, unsigned long vaddr, > - unsigned long size, > - enum dma_data_direction dma_dir) > +static void *vb2_vmalloc_get_userptr(struct vb2_buffer *vb, struct device *dev, > + unsigned long vaddr, unsigned long size) > { > struct vb2_vmalloc_buf *buf; > struct frame_vector *vec; > @@ -84,7 +82,7 @@ static void *vb2_vmalloc_get_userptr(struct device *dev, unsigned long vaddr, > if (!buf) > return ERR_PTR(-ENOMEM); > > - buf->dma_dir = dma_dir; > + buf->dma_dir = vb->vb2_queue->dma_dir; > offset = vaddr & ~PAGE_MASK; > buf->size = size; > vec = vb2_create_framevec(vaddr, size); > @@ -147,7 +145,7 @@ static void vb2_vmalloc_put_userptr(void *buf_priv) > kfree(buf); > } > > -static void *vb2_vmalloc_vaddr(void *buf_priv) > +static void *vb2_vmalloc_vaddr(struct vb2_buffer *vb, void *buf_priv) > { > struct vb2_vmalloc_buf *buf = buf_priv; > > @@ -339,7 +337,9 @@ static const struct dma_buf_ops vb2_vmalloc_dmabuf_ops = { > .release = vb2_vmalloc_dmabuf_ops_release, > }; > > -static struct dma_buf *vb2_vmalloc_get_dmabuf(void *buf_priv, unsigned long flags) > +static struct dma_buf *vb2_vmalloc_get_dmabuf(struct vb2_buffer *vb, > + void *buf_priv, > + unsigned long flags) > { > struct vb2_vmalloc_buf *buf = buf_priv; > struct dma_buf *dbuf; > @@ -403,8 +403,10 @@ static void vb2_vmalloc_detach_dmabuf(void *mem_priv) > kfree(buf); > } > > -static void *vb2_vmalloc_attach_dmabuf(struct device *dev, struct dma_buf *dbuf, > - unsigned long size, enum dma_data_direction dma_dir) > +static void *vb2_vmalloc_attach_dmabuf(struct vb2_buffer *vb, > + struct device *dev, > + struct dma_buf *dbuf, > + unsigned long size) > { > struct vb2_vmalloc_buf *buf; > > @@ -416,7 +418,7 @@ static void *vb2_vmalloc_attach_dmabuf(struct device *dev, struct dma_buf *dbuf, > return ERR_PTR(-ENOMEM); > > buf->dbuf = dbuf; > - buf->dma_dir = dma_dir; > + buf->dma_dir = vb->vb2_queue->dma_dir; > buf->size = size; > > return buf; > diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h > index 12955cb460d2..3b5986cee073 100644 > --- a/include/media/videobuf2-core.h > +++ b/include/media/videobuf2-core.h > @@ -46,6 +46,7 @@ enum vb2_memory { > > struct vb2_fileio_data; > struct vb2_threadio_data; > +struct vb2_buffer; > > /** > * struct vb2_mem_ops - memory handling/memory allocator operations. > @@ -53,10 +54,8 @@ struct vb2_threadio_data; > * return ERR_PTR() on failure or a pointer to allocator private, > * per-buffer data on success; the returned private structure > * will then be passed as @buf_priv argument to other ops in this > - * structure. Additional gfp_flags to use when allocating the > - * are also passed to this operation. These flags are from the > - * gfp_flags field of vb2_queue. The size argument to this function > - * shall be *page aligned*. > + * structure. The size argument to this function shall be > + * *page aligned*. > * @put: inform the allocator that the buffer will no longer be used; > * usually will result in the allocator freeing the buffer (if > * no other users of this buffer are present); the @buf_priv > @@ -117,31 +116,33 @@ struct vb2_threadio_data; > * map_dmabuf, unmap_dmabuf. > */ > struct vb2_mem_ops { > - void *(*alloc)(struct device *dev, unsigned long attrs, > - unsigned long size, > - enum dma_data_direction dma_dir, > - gfp_t gfp_flags); > + void *(*alloc)(struct vb2_buffer *vb, > + struct device *dev, > + unsigned long size); > void (*put)(void *buf_priv); > - struct dma_buf *(*get_dmabuf)(void *buf_priv, unsigned long flags); > - > - void *(*get_userptr)(struct device *dev, unsigned long vaddr, > - unsigned long size, > - enum dma_data_direction dma_dir); > + struct dma_buf *(*get_dmabuf)(struct vb2_buffer *vb, > + void *buf_priv, > + unsigned long flags); > + > + void *(*get_userptr)(struct vb2_buffer *vb, > + struct device *dev, > + unsigned long vaddr, > + unsigned long size); > void (*put_userptr)(void *buf_priv); > > void (*prepare)(void *buf_priv); > void (*finish)(void *buf_priv); > > - void *(*attach_dmabuf)(struct device *dev, > + void *(*attach_dmabuf)(struct vb2_buffer *vb, > + struct device *dev, > struct dma_buf *dbuf, > - unsigned long size, > - enum dma_data_direction dma_dir); > + unsigned long size); > void (*detach_dmabuf)(void *buf_priv); > int (*map_dmabuf)(void *buf_priv); > void (*unmap_dmabuf)(void *buf_priv); > > - void *(*vaddr)(void *buf_priv); > - void *(*cookie)(void *buf_priv); > + void *(*vaddr)(struct vb2_buffer *vb, void *buf_priv); > + void *(*cookie)(struct vb2_buffer *vb, void *buf_priv); > > unsigned int (*num_users)(void *buf_priv); > >