Correct return type for mem2mem buffer helpers
Subsystems (5)
cover Correct return type for mem2mem buffer helpers
As the subject says, we want to fix the return type of these mem2mem buffer helpers. They are currently returning a void pointer, which prevents type checking.
The patchset turned out to be much bigger than I was expecting, so it's splitted in per-driver patches.
It'd be awesome if driver maintainers can take review the changes.
Thanks!
Ezequiel Garcia (10):
mtk-jpeg: Correct return type for mem2mem buffer helpers
mtk-mdp: Correct return type for mem2mem buffer helpers
mtk-vcodec: Correct return type for mem2mem buffer helpers
mx2_emmaprp: Correct return type for mem2mem buffer helpers rockchip/rga: Correct return type for mem2mem buffer helpers
s5p-g2d: Correct return type for mem2mem buffer helpers
s5p-jpeg: Correct return type for mem2mem buffer helpers
sh_veu: Correct return type for mem2mem buffer helpers rockchip/vpu: Correct return type for mem2mem buffer helpers
media: v4l2-mem2mem: Correct return type for mem2mem buffer helpers
.../media/platform/mtk-jpeg/mtk_jpeg_core.c | 40 +++++------ drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c | 20 ++---- .../platform/mtk-vcodec/mtk_vcodec_dec.c | 62 +++++++--------- .../platform/mtk-vcodec/mtk_vcodec_enc.c | 72 ++++++++----------- drivers/media/platform/mx2_emmaprp.c | 6 +- drivers/media/platform/rockchip/rga/rga.c | 6 +- drivers/media/platform/s5p-g2d/g2d.c | 6 +- drivers/media/platform/s5p-jpeg/jpeg-core.c | 38 +++++----- drivers/media/platform/sh_veu.c | 4 +- drivers/media/v4l2-core/v4l2-mem2mem.c | 6 +- .../rockchip/vpu/rk3288_vpu_hw_jpeg_enc.c | 6 +- .../rockchip/vpu/rk3399_vpu_hw_jpeg_enc.c | 6 +- include/media/v4l2-mem2mem.h | 18 ++--- 13 files changed, 129 insertions(+), 161 deletions(-)
Signature · 1 line
2.20.1
PATCH 1/10 mtk-jpeg: Correct return type for mem2mem buffer helpers
Fix the assigned type of mem2mem buffer handling API. Namely, these functions:
v4l2_m2m_next_buf
v4l2_m2m_last_buf
v4l2_m2m_buf_remove
v4l2_m2m_next_src_buf
v4l2_m2m_next_dst_buf
v4l2_m2m_last_src_buf
v4l2_m2m_last_dst_buf
v4l2_m2m_src_buf_remove
v4l2_m2m_dst_buf_remove
return a struct vb2_v4l2_buffer, and not a struct vb2_buffer.
Fixing this is necessary to fix the mem2mem buffer handling API, changing the return to the correct struct vb2_v4l2_buffer instead of a void pointer.
--- .../media/platform/mtk-jpeg/mtk_jpeg_core.c | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-)
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c +20 -20
@@ -702,7 +702,7 @@ static void mtk_jpeg_buf_queue(struct vb2_buffer *vb)v4l2_m2m_buf_queue (ctx->fh.m2m_ctx,to_vb2_v4l2_buffer (vb)); } -static void *mtk_jpeg_buf_remove (struct mtk_jpeg_ctx *ctx, +static struct vb2_v4l2_buffer *mtk_jpeg_buf_remove (struct mtk_jpeg_ctx *ctx,enum v4l2_buf_type type) {if (V4L2_TYPE_IS_OUTPUT (type))
@@ -714,7 +714,7 @@ static void *mtk_jpeg_buf_remove(struct mtk_jpeg_ctx *ctx,static int mtk_jpeg_start_streaming (struct vb2_queue *q,unsigned int count) {struct mtk_jpeg_ctx *ctx =vb2_get_drv_priv (q); -struct vb2_buffer *vb; +struct vb2_v4l2_buffer *vb;int ret =0 ; ret =pm_runtime_get_sync (ctx->jpeg->dev);
@@ -724,14 +724,14 @@ static int mtk_jpeg_start_streaming(struct vb2_queue *q, unsigned int count)return 0 ; err:while ((vb =mtk_jpeg_buf_remove (ctx, q->type))) -v4l2_m2m_buf_done (to_vb2_v4l2_buffer (vb),VB2_BUF_STATE_QUEUED ); +v4l2_m2m_buf_done (vb,VB2_BUF_STATE_QUEUED );return ret; }static void mtk_jpeg_stop_streaming (struct vb2_queue *q) {struct mtk_jpeg_ctx *ctx =vb2_get_drv_priv (q); -struct vb2_buffer *vb; +struct vb2_v4l2_buffer *vb;/* * STREAMOFF is an acknowledgment for source change event.
@@ -743,7 +743,7 @@ static void mtk_jpeg_stop_streaming(struct vb2_queue *q)struct mtk_jpeg_src_buf *src_buf; vb =v4l2_m2m_next_src_buf (ctx->fh.m2m_ctx); - src_buf =mtk_jpeg_vb2_to_srcbuf (vb); + src_buf =mtk_jpeg_vb2_to_srcbuf (&vb->vb2_buf);mtk_jpeg_set_queue_data (ctx, &src_buf->dec_param); ctx->state =MTK_JPEG_RUNNING ; }else if (V4L2_TYPE_IS_OUTPUT (q->type)) {
@@ -751,7 +751,7 @@ static void mtk_jpeg_stop_streaming(struct vb2_queue *q) }while ((vb =mtk_jpeg_buf_remove (ctx, q->type))) -v4l2_m2m_buf_done (to_vb2_v4l2_buffer (vb),VB2_BUF_STATE_ERROR ); +v4l2_m2m_buf_done (vb,VB2_BUF_STATE_ERROR );pm_runtime_put_sync (ctx->jpeg->dev); }
@@ -807,7 +807,7 @@ static void mtk_jpeg_device_run(void *priv) {struct mtk_jpeg_ctx *ctx = priv;struct mtk_jpeg_dev *jpeg = ctx->jpeg; -struct vb2_buffer *src_buf, *dst_buf; +struct vb2_v4l2_buffer *src_buf, *dst_buf;enum vb2_buffer_state buf_state =VB2_BUF_STATE_ERROR ;unsigned long flags;struct mtk_jpeg_src_buf *jpeg_src_buf;
@@ -817,11 +817,11 @@ static void mtk_jpeg_device_run(void *priv) src_buf =v4l2_m2m_next_src_buf (ctx->fh.m2m_ctx); dst_buf =v4l2_m2m_next_dst_buf (ctx->fh.m2m_ctx); - jpeg_src_buf =mtk_jpeg_vb2_to_srcbuf (src_buf); + jpeg_src_buf =mtk_jpeg_vb2_to_srcbuf (&src_buf->vb2_buf);if (jpeg_src_buf->flags &MTK_JPEG_BUF_FLAGS_LAST_FRAME ) { -for (i =0 ; i < dst_buf->num_planes; i++) -vb2_set_plane_payload (dst_buf, i,0 ); +for (i =0 ; i < dst_buf->vb2_buf.num_planes; i++) +vb2_set_plane_payload (&dst_buf->vb2_buf, i,0 ); buf_state =VB2_BUF_STATE_DONE ; goto dec_end; }
@@ -833,8 +833,8 @@ static void mtk_jpeg_device_run(void *priv)return ; } -mtk_jpeg_set_dec_src (ctx, src_buf, &bs); -if (mtk_jpeg_set_dec_dst (ctx, &jpeg_src_buf->dec_param, dst_buf, &fb)) +mtk_jpeg_set_dec_src (ctx, &src_buf->vb2_buf, &bs); +if (mtk_jpeg_set_dec_dst (ctx, &jpeg_src_buf->dec_param, &dst_buf->vb2_buf, &fb)) goto dec_end;spin_lock_irqsave (&jpeg->hw_lock, flags);
@@ -849,8 +849,8 @@ static void mtk_jpeg_device_run(void *priv) dec_end:v4l2_m2m_src_buf_remove (ctx->fh.m2m_ctx);v4l2_m2m_dst_buf_remove (ctx->fh.m2m_ctx); -v4l2_m2m_buf_done (to_vb2_v4l2_buffer (src_buf), buf_state); -v4l2_m2m_buf_done (to_vb2_v4l2_buffer (dst_buf), buf_state); +v4l2_m2m_buf_done (src_buf, buf_state); +v4l2_m2m_buf_done (dst_buf, buf_state);v4l2_m2m_job_finish (jpeg->m2m_dev, ctx->fh.m2m_ctx); }
@@ -921,7 +921,7 @@ static irqreturn_t mtk_jpeg_dec_irq(int irq, void *priv) {struct mtk_jpeg_dev *jpeg = priv;struct mtk_jpeg_ctx *ctx; -struct vb2_buffer *src_buf, *dst_buf; +struct vb2_v4l2_buffer *src_buf, *dst_buf;struct mtk_jpeg_src_buf *jpeg_src_buf;enum vb2_buffer_state buf_state =VB2_BUF_STATE_ERROR ;u32 dec_irq_ret;
@@ -938,7 +938,7 @@ static irqreturn_t mtk_jpeg_dec_irq(int irq, void *priv) src_buf =v4l2_m2m_src_buf_remove (ctx->fh.m2m_ctx); dst_buf =v4l2_m2m_dst_buf_remove (ctx->fh.m2m_ctx); - jpeg_src_buf =mtk_jpeg_vb2_to_srcbuf (src_buf); + jpeg_src_buf =mtk_jpeg_vb2_to_srcbuf (&src_buf->vb2_buf);if (dec_irq_ret >=MTK_JPEG_DEC_RESULT_UNDERFLOW )mtk_jpeg_dec_reset (jpeg->dec_reg_base);
@@ -948,15 +948,15 @@ static irqreturn_t mtk_jpeg_dec_irq(int irq, void *priv) goto dec_end; } -for (i =0 ; i < dst_buf->num_planes; i++) -vb2_set_plane_payload (dst_buf, i, +for (i =0 ; i < dst_buf->vb2_buf.num_planes; i++) +vb2_set_plane_payload (&dst_buf->vb2_buf, i, jpeg_src_buf->dec_param.comp_size[i]); buf_state =VB2_BUF_STATE_DONE ; dec_end: -v4l2_m2m_buf_done (to_vb2_v4l2_buffer (src_buf), buf_state); -v4l2_m2m_buf_done (to_vb2_v4l2_buffer (dst_buf), buf_state); +v4l2_m2m_buf_done (src_buf, buf_state); +v4l2_m2m_buf_done (dst_buf, buf_state);v4l2_m2m_job_finish (jpeg->m2m_dev, ctx->fh.m2m_ctx);return IRQ_HANDLED ; }
Signature · 1 line
2.20.1
PATCH 2/10 mtk-mdp: Correct return type for mem2mem buffer helpers
In reply to Ezequiel GarciaFix the assigned type of mem2mem buffer handling API. Namely, these functions:
v4l2_m2m_next_buf
v4l2_m2m_last_buf
v4l2_m2m_buf_remove
v4l2_m2m_next_src_buf
v4l2_m2m_next_dst_buf
v4l2_m2m_last_src_buf
v4l2_m2m_last_dst_buf
v4l2_m2m_src_buf_remove
v4l2_m2m_dst_buf_remove
return a struct vb2_v4l2_buffer, and not a struct vb2_buffer.
Fixing this is necessary to fix the mem2mem buffer handling API, changing the return to the correct struct vb2_v4l2_buffer instead of a void pointer.
--- drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-)
drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c +7 -13
@@ -473,20 +473,17 @@ static void mtk_mdp_prepare_addr(struct mtk_mdp_ctx *ctx,static void mtk_mdp_m2m_get_bufs (struct mtk_mdp_ctx *ctx) {struct mtk_mdp_frame *s_frame, *d_frame; -struct vb2_buffer *src_vb, *dst_vb;struct vb2_v4l2_buffer *src_vbuf, *dst_vbuf; s_frame = &ctx->s_frame; d_frame = &ctx->d_frame; - src_vb =v4l2_m2m_next_src_buf (ctx->m2m_ctx); -mtk_mdp_prepare_addr (ctx, src_vb, s_frame, &s_frame->addr); + src_vbuf =v4l2_m2m_next_src_buf (ctx->m2m_ctx); +mtk_mdp_prepare_addr (ctx, &src_vbuf->vb2_buf, s_frame, &s_frame->addr); - dst_vb =v4l2_m2m_next_dst_buf (ctx->m2m_ctx); -mtk_mdp_prepare_addr (ctx, dst_vb, d_frame, &d_frame->addr); + dst_vbuf =v4l2_m2m_next_dst_buf (ctx->m2m_ctx); +mtk_mdp_prepare_addr (ctx, &dst_vbuf->vb2_buf, d_frame, &d_frame->addr); - src_vbuf =to_vb2_v4l2_buffer (src_vb); - dst_vbuf =to_vb2_v4l2_buffer (dst_vb); dst_vbuf->vb2_buf.timestamp = src_vbuf->vb2_buf.timestamp; }
@@ -494,17 +491,14 @@ static void mtk_mdp_process_done(void *priv, int vb_state) {struct mtk_mdp_dev *mdp = priv;struct mtk_mdp_ctx *ctx; -struct vb2_buffer *src_vb, *dst_vb; -struct vb2_v4l2_buffer *src_vbuf =NULL , *dst_vbuf =NULL ; +struct vb2_v4l2_buffer *src_vbuf, *dst_vbuf; ctx =v4l2_m2m_get_curr_priv (mdp->m2m_dev);if (!ctx)return ; - src_vb =v4l2_m2m_src_buf_remove (ctx->m2m_ctx); - src_vbuf =to_vb2_v4l2_buffer (src_vb); - dst_vb =v4l2_m2m_dst_buf_remove (ctx->m2m_ctx); - dst_vbuf =to_vb2_v4l2_buffer (dst_vb); + src_vbuf =v4l2_m2m_src_buf_remove (ctx->m2m_ctx); + dst_vbuf =v4l2_m2m_dst_buf_remove (ctx->m2m_ctx); dst_vbuf->vb2_buf.timestamp = src_vbuf->vb2_buf.timestamp; dst_vbuf->timecode = src_vbuf->timecode;
Signature · 1 line
2.20.1
PATCH 3/10 mtk-vcodec: Correct return type for mem2mem buffer helpers
In reply to Ezequiel GarciaFix the assigned type of mem2mem buffer handling API. Namely, these functions:
v4l2_m2m_next_buf
v4l2_m2m_last_buf
v4l2_m2m_buf_remove
v4l2_m2m_next_src_buf
v4l2_m2m_next_dst_buf
v4l2_m2m_last_src_buf
v4l2_m2m_last_dst_buf
v4l2_m2m_src_buf_remove
v4l2_m2m_dst_buf_remove
return a struct vb2_v4l2_buffer, and not a struct vb2_buffer.
Fixing this is necessary to fix the mem2mem buffer handling API, changing the return to the correct struct vb2_v4l2_buffer instead of a void pointer.
--- .../platform/mtk-vcodec/mtk_vcodec_dec.c | 62 +++++++--------- .../platform/mtk-vcodec/mtk_vcodec_enc.c | 72 ++++++++----------- 2 files changed, 54 insertions(+), 80 deletions(-)
drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c +26 -36
@@ -325,13 +325,12 @@ static void mtk_vdec_worker(struct work_struct *work) struct mtk_vcodec_ctx *ctx = container_of(work, struct mtk_vcodec_ctx, decode_work);struct mtk_vcodec_dev *dev = ctx->dev; -struct vb2_buffer *src_buf, *dst_buf; +struct vb2_v4l2_buffer *src_buf, *dst_buf;struct mtk_vcodec_mem buf;struct vdec_fb *pfb;bool res_chg = false;int ret;struct mtk_video_dec_buf *dst_buf_info, *src_buf_info; -struct vb2_v4l2_buffer *dst_vb2_v4l2, *src_vb2_v4l2; src_buf =v4l2_m2m_next_src_buf (ctx->m2m_ctx);if (src_buf ==NULL ) {
@@ -347,26 +346,23 @@ static void mtk_vdec_worker(struct work_struct *work)return ; } - src_vb2_v4l2 = container_of(src_buf, struct vb2_v4l2_buffer, vb2_buf); - src_buf_info = container_of(src_vb2_v4l2, struct mtk_video_dec_buf, vb); - - dst_vb2_v4l2 = container_of(dst_buf, struct vb2_v4l2_buffer, vb2_buf); - dst_buf_info = container_of(dst_vb2_v4l2, struct mtk_video_dec_buf, vb); + src_buf_info = container_of(src_buf, struct mtk_video_dec_buf, vb); + dst_buf_info = container_of(dst_buf, struct mtk_video_dec_buf, vb); pfb = &dst_buf_info->frame_buffer; - pfb->base_y.va =vb2_plane_vaddr (dst_buf,0 ); - pfb->base_y.dma_addr =vb2_dma_contig_plane_dma_addr (dst_buf,0 ); + pfb->base_y.va =vb2_plane_vaddr (&dst_buf->vb2_buf,0 ); + pfb->base_y.dma_addr =vb2_dma_contig_plane_dma_addr (&dst_buf->vb2_buf,0 ); pfb->base_y.size = ctx->picinfo.y_bs_sz + ctx->picinfo.y_len_sz; - pfb->base_c.va =vb2_plane_vaddr (dst_buf,1 ); - pfb->base_c.dma_addr =vb2_dma_contig_plane_dma_addr (dst_buf,1 ); + pfb->base_c.va =vb2_plane_vaddr (&dst_buf->vb2_buf,1 ); + pfb->base_c.dma_addr =vb2_dma_contig_plane_dma_addr (&dst_buf->vb2_buf,1 ); pfb->base_c.size = ctx->picinfo.c_bs_sz + ctx->picinfo.c_len_sz; pfb->status =0 ;mtk_v4l2_debug (3 ,"===>[%d] vdec_if_decode() ===>" , ctx->id);mtk_v4l2_debug (3 ,"id=%d Framebuf pfb=%p VA=%p Y_DMA=%pad C_DMA=%pad Size=%zx" , - dst_buf->index, pfb, + dst_buf->vb2_buf.index, pfb, pfb->base_y.va, &pfb->base_y.dma_addr, &pfb->base_c.dma_addr, pfb->base_y.size);
@@ -384,19 +380,19 @@ static void mtk_vdec_worker(struct work_struct *work)clean_display_buffer (ctx);vb2_set_plane_payload (&dst_buf_info->vb.vb2_buf,0 ,0 );vb2_set_plane_payload (&dst_buf_info->vb.vb2_buf,1 ,0 ); - dst_vb2_v4l2->flags |=V4L2_BUF_FLAG_LAST ; + dst_buf->flags |=V4L2_BUF_FLAG_LAST ;v4l2_m2m_buf_done (&dst_buf_info->vb,VB2_BUF_STATE_DONE );clean_free_buffer (ctx);v4l2_m2m_job_finish (dev->m2m_dev_dec, ctx->m2m_ctx);return ; } - buf.va =vb2_plane_vaddr (src_buf,0 ); - buf.dma_addr =vb2_dma_contig_plane_dma_addr (src_buf,0 ); + buf.va =vb2_plane_vaddr (&src_buf->vb2_buf,0 ); + buf.dma_addr =vb2_dma_contig_plane_dma_addr (&src_buf->vb2_buf,0 ); buf.size = (size_t )src_buf->planes[0 ].bytesused;if (!buf.va) {v4l2_m2m_job_finish (dev->m2m_dev_dec, ctx->m2m_ctx);mtk_v4l2_err ("[%d] id=%d src_addr is NULL!!" , - ctx->id, src_buf->index); + ctx->id, src_buf->vb2_buf.index);return ; } mtk_v4l2_debug(3, "[%d] Bitstream VA=%p DMA=%pad Size=%zx vb=%p",
@@ -416,10 +412,10 @@ static void mtk_vdec_worker(struct work_struct *work)mtk_v4l2_err (" <===[%d], src_buf[%d] sz=0x%zx pts=%llu dst_buf[%d] vdec_if_decode() ret=%d res_chg=%d===>" , ctx->id, - src_buf->index, + src_buf->vb2_buf.index, buf.size, src_buf_info->vb.vb2_buf.timestamp, - dst_buf->index, + dst_buf->vb2_buf.index, ret, res_chg); src_buf =v4l2_m2m_src_buf_remove (ctx->m2m_ctx);if (ret == -EIO ) {
@@ -1103,7 +1099,7 @@ static int vb2ops_vdec_buf_prepare(struct vb2_buffer *vb)static void vb2ops_vdec_buf_queue (struct vb2_buffer *vb) { -struct vb2_buffer *src_buf; +struct vb2_v4l2_buffer *src_buf;struct mtk_vcodec_mem src_mem;bool res_chg = false;int ret =0 ;
@@ -1149,8 +1145,7 @@ static void vb2ops_vdec_buf_queue(struct vb2_buffer *vb)mtk_v4l2_err ("No src buffer" );return ; } - vb2_v4l2 =to_vb2_v4l2_buffer (src_buf); - buf = container_of(vb2_v4l2, struct mtk_video_dec_buf, vb); + buf = container_of(src_buf, struct mtk_video_dec_buf, vb);if (buf->lastframe) {/* This shouldn't happen. Just in case. */ mtk_v4l2_err ("Invalid flush buffer." );
@@ -1158,8 +1153,8 @@ static void vb2ops_vdec_buf_queue(struct vb2_buffer *vb)return ; } - src_mem.va =vb2_plane_vaddr (src_buf,0 ); - src_mem.dma_addr =vb2_dma_contig_plane_dma_addr (src_buf,0 ); + src_mem.va =vb2_plane_vaddr (&src_buf->vb2_buf,0 ); + src_mem.dma_addr =vb2_dma_contig_plane_dma_addr (&src_buf->vb2_buf,0 ); src_mem.size = (size_t )src_buf->planes[0 ].bytesused; mtk_v4l2_debug(2, "[%d] buf id=%d va=%p dma=%pad size=%zx",
@@ -1181,11 +1176,9 @@ static void vb2ops_vdec_buf_queue(struct vb2_buffer *vb)mtk_v4l2_err ("[%d] Unrecoverable error in vdec_if_decode." , ctx->id); ctx->state =MTK_STATE_ABORT ; -v4l2_m2m_buf_done (to_vb2_v4l2_buffer (src_buf), -VB2_BUF_STATE_ERROR ); +v4l2_m2m_buf_done (src_buf,VB2_BUF_STATE_ERROR ); }else { -v4l2_m2m_buf_done (to_vb2_v4l2_buffer (src_buf), -VB2_BUF_STATE_DONE ); +v4l2_m2m_buf_done (src_buf,VB2_BUF_STATE_DONE ); } mtk_v4l2_debug(ret ? 0 : 1, "[%d] vdec_if_decode() src_buf=%d, size=%zu, fail=%d, res_chg=%d",
@@ -1281,7 +1274,7 @@ static int vb2ops_vdec_start_streaming(struct vb2_queue *q, unsigned int count)static void vb2ops_vdec_stop_streaming (struct vb2_queue *q) { -struct vb2_buffer *src_buf =NULL , *dst_buf =NULL ; +struct vb2_v4l2_buffer *src_buf =NULL , *dst_buf =NULL ;struct mtk_vcodec_ctx *ctx =vb2_get_drv_priv (q); mtk_v4l2_debug(3, "[%d] (%d) state=(%x) ctx->decoded_frame_cnt=%d",
@@ -1289,12 +1282,10 @@ static void vb2ops_vdec_stop_streaming(struct vb2_queue *q)if (q->type ==V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE ) {while ((src_buf =v4l2_m2m_src_buf_remove (ctx->m2m_ctx))) { -struct vb2_v4l2_buffer *vb2_v4l2 = -to_vb2_v4l2_buffer (src_buf);struct mtk_video_dec_buf *buf_info =container_of ( - vb2_v4l2, struct mtk_video_dec_buf, vb); + src_buf, struct mtk_video_dec_buf, vb);if (!buf_info->lastframe) -v4l2_m2m_buf_done (vb2_v4l2, +v4l2_m2m_buf_done (src_buf,VB2_BUF_STATE_ERROR ); }return ;
@@ -1323,10 +1314,9 @@ static void vb2ops_vdec_stop_streaming(struct vb2_queue *q) ctx->state =MTK_STATE_FLUSH ;while ((dst_buf =v4l2_m2m_dst_buf_remove (ctx->m2m_ctx))) { -vb2_set_plane_payload (dst_buf,0 ,0 ); -vb2_set_plane_payload (dst_buf,1 ,0 ); -v4l2_m2m_buf_done (to_vb2_v4l2_buffer (dst_buf), -VB2_BUF_STATE_ERROR ); +vb2_set_plane_payload (&dst_buf->vb2_buf,0 ,0 ); +vb2_set_plane_payload (&dst_buf->vb2_buf,1 ,0 ); +v4l2_m2m_buf_done (dst_buf,VB2_BUF_STATE_ERROR ); } }
drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c +28 -44
167 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH 4/10 mx2_emmaprp: Correct return type for mem2mem buffer helpers
In reply to Ezequiel GarciaFix the assigned type of mem2mem buffer handling API. Namely, these functions:
v4l2_m2m_next_buf
v4l2_m2m_last_buf
v4l2_m2m_buf_remove
v4l2_m2m_next_src_buf
v4l2_m2m_next_dst_buf
v4l2_m2m_last_src_buf
v4l2_m2m_last_dst_buf
v4l2_m2m_src_buf_remove
v4l2_m2m_dst_buf_remove
return a struct vb2_v4l2_buffer, and not a struct vb2_buffer.
Fixing this is necessary to fix the mem2mem buffer handling API, changing the return to the correct struct vb2_v4l2_buffer instead of a void pointer.
--- drivers/media/platform/mx2_emmaprp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/media/platform/mx2_emmaprp.c +3 -3
@@ -274,7 +274,7 @@ static void emmaprp_device_run(void *priv) {struct emmaprp_ctx *ctx = priv;struct emmaprp_q_data *s_q_data, *d_q_data; -struct vb2_buffer *src_buf, *dst_buf; +struct vb2_v4l2_buffer *src_buf, *dst_buf;struct emmaprp_dev *pcdev = ctx->dev;unsigned int s_width, s_height;unsigned int d_width, d_height;
@@ -294,8 +294,8 @@ static void emmaprp_device_run(void *priv) d_height = d_q_data->height; d_size = d_width * d_height; - p_in =vb2_dma_contig_plane_dma_addr (src_buf,0 ); - p_out =vb2_dma_contig_plane_dma_addr (dst_buf,0 ); + p_in =vb2_dma_contig_plane_dma_addr (&src_buf->vb2_buf,0 ); + p_out =vb2_dma_contig_plane_dma_addr (&dst_buf->vb2_buf,0 );if (!p_in || !p_out) {v4l2_err (&pcdev->v4l2_dev,"Acquiring kernel pointers to buffers failed\n" );
Signature · 1 line
2.20.1
PATCH 5/10 rockchip/rga: Correct return type for mem2mem buffer helpers
In reply to Ezequiel GarciaFix the assigned type of mem2mem buffer handling API. Namely, these functions:
v4l2_m2m_next_buf
v4l2_m2m_last_buf
v4l2_m2m_buf_remove
v4l2_m2m_next_src_buf
v4l2_m2m_next_dst_buf
v4l2_m2m_last_src_buf
v4l2_m2m_last_dst_buf
v4l2_m2m_src_buf_remove
v4l2_m2m_dst_buf_remove
return a struct vb2_v4l2_buffer, and not a struct vb2_buffer.
Fixing this is necessary to fix the mem2mem buffer handling API, changing the return to the correct struct vb2_v4l2_buffer instead of a void pointer.
--- drivers/media/platform/rockchip/rga/rga.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/media/platform/rockchip/rga/rga.c +3 -3
@@ -43,7 +43,7 @@ static void device_run(void *prv) {struct rga_ctx *ctx = prv;struct rockchip_rga *rga = ctx->rga; -struct vb2_buffer *src, *dst; +struct vb2_v4l2_buffer *src, *dst;unsigned long flags;spin_lock_irqsave (&rga->ctrl_lock, flags);
@@ -53,8 +53,8 @@ static void device_run(void *prv) src =v4l2_m2m_next_src_buf (ctx->fh.m2m_ctx); dst =v4l2_m2m_next_dst_buf (ctx->fh.m2m_ctx); -rga_buf_map (src); -rga_buf_map (dst); +rga_buf_map (&src->vb2_buf); +rga_buf_map (&dst->vb2_buf);rga_hw_start (rga);
Signature · 1 line
2.20.1
PATCH 6/10 s5p-g2d: Correct return type for mem2mem buffer helpers
In reply to Ezequiel GarciaFix the assigned type of mem2mem buffer handling API. Namely, these functions:
v4l2_m2m_next_buf
v4l2_m2m_last_buf
v4l2_m2m_buf_remove
v4l2_m2m_next_src_buf
v4l2_m2m_next_dst_buf
v4l2_m2m_last_src_buf
v4l2_m2m_last_dst_buf
v4l2_m2m_src_buf_remove
v4l2_m2m_dst_buf_remove
return a struct vb2_v4l2_buffer, and not a struct vb2_buffer.
Fixing this is necessary to fix the mem2mem buffer handling API, changing the return to the correct struct vb2_v4l2_buffer instead of a void pointer.
--- drivers/media/platform/s5p-g2d/g2d.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/media/platform/s5p-g2d/g2d.c +3 -3
@@ -513,7 +513,7 @@ static void device_run(void *prv) {struct g2d_ctx *ctx = prv;struct g2d_dev *dev = ctx->dev; -struct vb2_buffer *src, *dst; +struct vb2_v4l2_buffer *src, *dst;unsigned long flags;u32 cmd =0 ;
@@ -528,10 +528,10 @@ static void device_run(void *prv)spin_lock_irqsave (&dev->ctrl_lock, flags);g2d_set_src_size (dev, &ctx->in); -g2d_set_src_addr (dev,vb2_dma_contig_plane_dma_addr (src,0 )); +g2d_set_src_addr (dev,vb2_dma_contig_plane_dma_addr (&src->vb2_buf,0 ));g2d_set_dst_size (dev, &ctx->out); -g2d_set_dst_addr (dev,vb2_dma_contig_plane_dma_addr (dst,0 )); +g2d_set_dst_addr (dev,vb2_dma_contig_plane_dma_addr (&dst->vb2_buf,0 ));g2d_set_rop4 (dev, ctx->rop);g2d_set_flip (dev, ctx->flip);
Signature · 1 line
2.20.1
PATCH 7/10 s5p-jpeg: Correct return type for mem2mem buffer helpers
In reply to Ezequiel GarciaFix the assigned type of mem2mem buffer handling API. Namely, these functions:
v4l2_m2m_next_buf
v4l2_m2m_last_buf
v4l2_m2m_buf_remove
v4l2_m2m_next_src_buf
v4l2_m2m_next_dst_buf
v4l2_m2m_last_src_buf
v4l2_m2m_last_dst_buf
v4l2_m2m_src_buf_remove
v4l2_m2m_dst_buf_remove
return a struct vb2_v4l2_buffer, and not a struct vb2_buffer.
Fixing this is necessary to fix the mem2mem buffer handling API, changing the return to the correct struct vb2_v4l2_buffer instead of a void pointer.
--- drivers/media/platform/s5p-jpeg/jpeg-core.c | 38 ++++++++++----------- 1 file changed, 19 insertions(+), 19 deletions(-)
drivers/media/platform/s5p-jpeg/jpeg-core.c +19 -19
@@ -793,14 +793,14 @@ static void skip(struct s5p_jpeg_buffer *buf, long len);static void exynos4_jpeg_parse_decode_h_tbl (struct s5p_jpeg_ctx *ctx) {struct s5p_jpeg *jpeg = ctx->jpeg; -struct vb2_buffer *vb =v4l2_m2m_next_src_buf (ctx->fh.m2m_ctx); +struct vb2_v4l2_buffer *vb =v4l2_m2m_next_src_buf (ctx->fh.m2m_ctx);struct s5p_jpeg_buffer jpeg_buffer;unsigned int word;int c, x, components; jpeg_buffer.size =2 ;/* Ls */ jpeg_buffer.data = - (unsigned long )vb2_plane_vaddr (vb,0 ) + ctx->out_q.sos +2 ; + (unsigned long )vb2_plane_vaddr (&vb->vb2_buf,0 ) + ctx->out_q.sos +2 ; jpeg_buffer.curr =0 ; word =0 ;
@@ -830,14 +830,14 @@ static void exynos4_jpeg_parse_decode_h_tbl(struct s5p_jpeg_ctx *ctx)static void exynos4_jpeg_parse_huff_tbl (struct s5p_jpeg_ctx *ctx) {struct s5p_jpeg *jpeg = ctx->jpeg; -struct vb2_buffer *vb =v4l2_m2m_next_src_buf (ctx->fh.m2m_ctx); +struct vb2_v4l2_buffer *vb =v4l2_m2m_next_src_buf (ctx->fh.m2m_ctx);struct s5p_jpeg_buffer jpeg_buffer;unsigned int word;int c, i, n, j;for (j =0 ; j < ctx->out_q.dht.n; ++j) { jpeg_buffer.size = ctx->out_q.dht.len[j]; - jpeg_buffer.data = (unsigned long )vb2_plane_vaddr (vb,0 ) + + jpeg_buffer.data = (unsigned long )vb2_plane_vaddr (&vb->vb2_buf,0 ) + ctx->out_q.dht.marker[j]; jpeg_buffer.curr =0 ;
@@ -889,13 +889,13 @@ static void exynos4_jpeg_parse_huff_tbl(struct s5p_jpeg_ctx *ctx)static void exynos4_jpeg_parse_decode_q_tbl (struct s5p_jpeg_ctx *ctx) {struct s5p_jpeg *jpeg = ctx->jpeg; -struct vb2_buffer *vb =v4l2_m2m_next_src_buf (ctx->fh.m2m_ctx); +struct vb2_v4l2_buffer *vb =v4l2_m2m_next_src_buf (ctx->fh.m2m_ctx);struct s5p_jpeg_buffer jpeg_buffer;int c, x, components; jpeg_buffer.size = ctx->out_q.sof_len; jpeg_buffer.data = - (unsigned long )vb2_plane_vaddr (vb,0 ) + ctx->out_q.sof; + (unsigned long )vb2_plane_vaddr (&vb->vb2_buf,0 ) + ctx->out_q.sof; jpeg_buffer.curr =0 ;skip (&jpeg_buffer,5 );/* P, Y, X */
@@ -920,14 +920,14 @@ static void exynos4_jpeg_parse_decode_q_tbl(struct s5p_jpeg_ctx *ctx)static void exynos4_jpeg_parse_q_tbl (struct s5p_jpeg_ctx *ctx) {struct s5p_jpeg *jpeg = ctx->jpeg; -struct vb2_buffer *vb =v4l2_m2m_next_src_buf (ctx->fh.m2m_ctx); +struct vb2_v4l2_buffer *vb =v4l2_m2m_next_src_buf (ctx->fh.m2m_ctx);struct s5p_jpeg_buffer jpeg_buffer;unsigned int word;int c, i, j;for (j =0 ; j < ctx->out_q.dqt.n; ++j) { jpeg_buffer.size = ctx->out_q.dqt.len[j]; - jpeg_buffer.data = (unsigned long )vb2_plane_vaddr (vb,0 ) + + jpeg_buffer.data = (unsigned long )vb2_plane_vaddr (&vb->vb2_buf,0 ) + ctx->out_q.dqt.marker[j]; jpeg_buffer.curr =0 ;
@@ -2075,15 +2075,15 @@ static void s5p_jpeg_device_run(void *priv) {struct s5p_jpeg_ctx *ctx = priv;struct s5p_jpeg *jpeg = ctx->jpeg; -struct vb2_buffer *src_buf, *dst_buf; +struct vb2_v4l2_buffer *src_buf, *dst_buf;unsigned long src_addr, dst_addr, flags;spin_lock_irqsave (&ctx->jpeg->slock, flags); src_buf =v4l2_m2m_next_src_buf (ctx->fh.m2m_ctx); dst_buf =v4l2_m2m_next_dst_buf (ctx->fh.m2m_ctx); - src_addr =vb2_dma_contig_plane_dma_addr (src_buf,0 ); - dst_addr =vb2_dma_contig_plane_dma_addr (dst_buf,0 ); + src_addr =vb2_dma_contig_plane_dma_addr (&src_buf->vb2_buf,0 ); + dst_addr =vb2_dma_contig_plane_dma_addr (&dst_buf->vb2_buf,0 );s5p_jpeg_reset (jpeg->regs);s5p_jpeg_poweron (jpeg->regs);
@@ -2156,7 +2156,7 @@ static void exynos4_jpeg_set_img_addr(struct s5p_jpeg_ctx *ctx) {struct s5p_jpeg *jpeg = ctx->jpeg;struct s5p_jpeg_fmt *fmt; -struct vb2_buffer *vb; +struct vb2_v4l2_buffer *vb;struct s5p_jpeg_addr jpeg_addr = {};u32 pix_size, padding_bytes =0 ;
@@ -2175,7 +2175,7 @@ static void exynos4_jpeg_set_img_addr(struct s5p_jpeg_ctx *ctx) vb =v4l2_m2m_next_dst_buf (ctx->fh.m2m_ctx); } - jpeg_addr.y =vb2_dma_contig_plane_dma_addr (vb,0 ); + jpeg_addr.y =vb2_dma_contig_plane_dma_addr (&vb->vb2_buf,0 );if (fmt->colplanes ==2 ) { jpeg_addr.cb = jpeg_addr.y + pix_size - padding_bytes;
@@ -2193,7 +2193,7 @@ static void exynos4_jpeg_set_img_addr(struct s5p_jpeg_ctx *ctx)static void exynos4_jpeg_set_jpeg_addr (struct s5p_jpeg_ctx *ctx) {struct s5p_jpeg *jpeg = ctx->jpeg; -struct vb2_buffer *vb; +struct vb2_v4l2_buffer *vb;unsigned int jpeg_addr =0 ;if (ctx->mode ==S5P_JPEG_ENCODE )
@@ -2201,7 +2201,7 @@ static void exynos4_jpeg_set_jpeg_addr(struct s5p_jpeg_ctx *ctx)else vb =v4l2_m2m_next_src_buf (ctx->fh.m2m_ctx); - jpeg_addr =vb2_dma_contig_plane_dma_addr (vb,0 ); + jpeg_addr =vb2_dma_contig_plane_dma_addr (&vb->vb2_buf,0 );if (jpeg->variant->version ==SJPEG_EXYNOS5433 && ctx->mode ==S5P_JPEG_DECODE ) jpeg_addr += ctx->out_q.sos;
@@ -2317,7 +2317,7 @@ static void exynos3250_jpeg_set_img_addr(struct s5p_jpeg_ctx *ctx) {struct s5p_jpeg *jpeg = ctx->jpeg;struct s5p_jpeg_fmt *fmt; -struct vb2_buffer *vb; +struct vb2_v4l2_buffer *vb;struct s5p_jpeg_addr jpeg_addr = {};u32 pix_size;
@@ -2331,7 +2331,7 @@ static void exynos3250_jpeg_set_img_addr(struct s5p_jpeg_ctx *ctx) fmt = ctx->cap_q.fmt; } - jpeg_addr.y =vb2_dma_contig_plane_dma_addr (vb,0 ); + jpeg_addr.y =vb2_dma_contig_plane_dma_addr (&vb->vb2_buf,0 );if (fmt->colplanes ==2 ) { jpeg_addr.cb = jpeg_addr.y + pix_size;
@@ -2349,7 +2349,7 @@ static void exynos3250_jpeg_set_img_addr(struct s5p_jpeg_ctx *ctx)static void exynos3250_jpeg_set_jpeg_addr (struct s5p_jpeg_ctx *ctx) {struct s5p_jpeg *jpeg = ctx->jpeg; -struct vb2_buffer *vb; +struct vb2_v4l2_buffer *vb;unsigned int jpeg_addr =0 ;if (ctx->mode ==S5P_JPEG_ENCODE )
@@ -2357,7 +2357,7 @@ static void exynos3250_jpeg_set_jpeg_addr(struct s5p_jpeg_ctx *ctx)else vb =v4l2_m2m_next_src_buf (ctx->fh.m2m_ctx); - jpeg_addr =vb2_dma_contig_plane_dma_addr (vb,0 ); + jpeg_addr =vb2_dma_contig_plane_dma_addr (&vb->vb2_buf,0 );exynos3250_jpeg_jpgadr (jpeg->regs, jpeg_addr); }
Signature · 1 line
2.20.1
PATCH 8/10 sh_veu: Correct return type for mem2mem buffer helpers
In reply to Ezequiel GarciaFix the assigned type of mem2mem buffer handling API. Namely, these functions:
v4l2_m2m_next_buf
v4l2_m2m_last_buf
v4l2_m2m_buf_remove
v4l2_m2m_next_src_buf
v4l2_m2m_next_dst_buf
v4l2_m2m_last_src_buf
v4l2_m2m_last_dst_buf
v4l2_m2m_src_buf_remove
v4l2_m2m_dst_buf_remove
return a struct vb2_v4l2_buffer, and not a struct vb2_buffer.
Fixing this is necessary to fix the mem2mem buffer handling API, changing the return to the correct struct vb2_v4l2_buffer instead of a void pointer.
--- drivers/media/platform/sh_veu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/media/platform/sh_veu.c +2 -2
@@ -273,13 +273,13 @@ static void sh_veu_process(struct sh_veu_dev *veu,static void sh_veu_device_run (void *priv) {struct sh_veu_dev *veu = priv; -struct vb2_buffer *src_buf, *dst_buf; +struct vb2_v4l2_buffer *src_buf, *dst_buf; src_buf =v4l2_m2m_next_src_buf (veu->m2m_ctx); dst_buf =v4l2_m2m_next_dst_buf (veu->m2m_ctx);if (src_buf && dst_buf) -sh_veu_process (veu, src_buf, dst_buf); +sh_veu_process (veu, &src_buf->vb2_buf, &dst_buf->vb2_buf); }/* ========== video ioctls ========== */
Signature · 1 line
2.20.1
PATCH 9/10 rockchip/vpu: Correct return type for mem2mem buffer helpers
In reply to Ezequiel GarciaFix the assigned type of mem2mem buffer handling API. Namely, these functions:
v4l2_m2m_next_buf
v4l2_m2m_last_buf
v4l2_m2m_buf_remove
v4l2_m2m_next_src_buf
v4l2_m2m_next_dst_buf
v4l2_m2m_last_src_buf
v4l2_m2m_last_dst_buf
v4l2_m2m_src_buf_remove
v4l2_m2m_dst_buf_remove
return a struct vb2_v4l2_buffer, and not a struct vb2_buffer.
Fixing this is necessary to fix the mem2mem buffer handling API, changing the return to the correct struct vb2_v4l2_buffer instead of a void pointer.
--- drivers/staging/media/rockchip/vpu/rk3288_vpu_hw_jpeg_enc.c | 6 +++--- drivers/staging/media/rockchip/vpu/rk3399_vpu_hw_jpeg_enc.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-)
drivers/staging/media/rockchip/vpu/rk3288_vpu_hw_jpeg_enc.c +3 -3
@@ -80,7 +80,7 @@ rk3288_vpu_jpeg_enc_set_qtable(struct rockchip_vpu_dev *vpu,void rk3288_vpu_jpeg_enc_run (struct rockchip_vpu_ctx *ctx) {struct rockchip_vpu_dev *vpu = ctx->dev; -struct vb2_buffer *src_buf, *dst_buf; +struct vb2_v4l2_buffer *src_buf, *dst_buf;struct rockchip_vpu_jpeg_ctx jpeg_ctx;u32 reg;
@@ -88,7 +88,7 @@ void rk3288_vpu_jpeg_enc_run(struct rockchip_vpu_ctx *ctx) dst_buf =v4l2_m2m_next_dst_buf (ctx->fh.m2m_ctx);memset (&jpeg_ctx,0 ,sizeof (jpeg_ctx)); - jpeg_ctx.buffer =vb2_plane_vaddr (dst_buf,0 ); + jpeg_ctx.buffer =vb2_plane_vaddr (&dst_buf->vb2_buf,0 ); jpeg_ctx.width = ctx->dst_fmt.width; jpeg_ctx.height = ctx->dst_fmt.height; jpeg_ctx.quality = ctx->jpeg_quality;
@@ -99,7 +99,7 @@ void rk3288_vpu_jpeg_enc_run(struct rockchip_vpu_ctx *ctx) VEPU_REG_ENC_CTRL);rk3288_vpu_set_src_img_ctrl (vpu, ctx); -rk3288_vpu_jpeg_enc_set_buffers (vpu, ctx, src_buf); +rk3288_vpu_jpeg_enc_set_buffers (vpu, ctx, &src_buf->vb2_buf);rk3288_vpu_jpeg_enc_set_qtable (vpu,rockchip_vpu_jpeg_get_qtable (&jpeg_ctx,0 ),rockchip_vpu_jpeg_get_qtable (&jpeg_ctx,1 ));
drivers/staging/media/rockchip/vpu/rk3399_vpu_hw_jpeg_enc.c +3 -3
@@ -111,7 +111,7 @@ rk3399_vpu_jpeg_enc_set_qtable(struct rockchip_vpu_dev *vpu,void rk3399_vpu_jpeg_enc_run (struct rockchip_vpu_ctx *ctx) {struct rockchip_vpu_dev *vpu = ctx->dev; -struct vb2_buffer *src_buf, *dst_buf; +struct vb2_v4l2_buffer *src_buf, *dst_buf;struct rockchip_vpu_jpeg_ctx jpeg_ctx;u32 reg;
@@ -119,7 +119,7 @@ void rk3399_vpu_jpeg_enc_run(struct rockchip_vpu_ctx *ctx) dst_buf =v4l2_m2m_next_dst_buf (ctx->fh.m2m_ctx);memset (&jpeg_ctx,0 ,sizeof (jpeg_ctx)); - jpeg_ctx.buffer =vb2_plane_vaddr (dst_buf,0 ); + jpeg_ctx.buffer =vb2_plane_vaddr (&dst_buf->vb2_buf,0 ); jpeg_ctx.width = ctx->dst_fmt.width; jpeg_ctx.height = ctx->dst_fmt.height; jpeg_ctx.quality = ctx->jpeg_quality;
@@ -130,7 +130,7 @@ void rk3399_vpu_jpeg_enc_run(struct rockchip_vpu_ctx *ctx) VEPU_REG_ENCODE_START);rk3399_vpu_set_src_img_ctrl (vpu, ctx); -rk3399_vpu_jpeg_enc_set_buffers (vpu, ctx, src_buf); +rk3399_vpu_jpeg_enc_set_buffers (vpu, ctx, &src_buf->vb2_buf);rk3399_vpu_jpeg_enc_set_qtable (vpu,rockchip_vpu_jpeg_get_qtable (&jpeg_ctx,0 ),rockchip_vpu_jpeg_get_qtable (&jpeg_ctx,1 ));
Signature · 1 line
2.20.1
PATCH 10/10 media: v4l2-mem2mem: Correct return type for mem2mem buffer helpers
In reply to Ezequiel GarciaThis commit changes the return type of mem2mem buffer handling API. Namely, these functions:
v4l2_m2m_next_buf
v4l2_m2m_last_buf
v4l2_m2m_buf_remove
v4l2_m2m_next_src_buf
v4l2_m2m_next_dst_buf
v4l2_m2m_last_src_buf
v4l2_m2m_last_dst_buf
v4l2_m2m_src_buf_remove
v4l2_m2m_dst_buf_remove
which currently return void pointer.
In every case, the actual return type is a struct vb2_v4l2_buffer pointer. Change the return type of the listed functions, so type checking can be properly used.
--- drivers/media/v4l2-core/v4l2-mem2mem.c | 6 +++--- include/media/v4l2-mem2mem.h | 18 +++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-)
drivers/media/v4l2-core/v4l2-mem2mem.c +3 -3
@@ -131,7 +131,7 @@ struct vb2_queue *v4l2_m2m_get_vq(struct v4l2_m2m_ctx *m2m_ctx, }EXPORT_SYMBOL (v4l2_m2m_get_vq); -void *v4l2_m2m_next_buf (struct v4l2_m2m_queue_ctx *q_ctx) +struct vb2_v4l2_buffer *v4l2_m2m_next_buf (struct v4l2_m2m_queue_ctx *q_ctx) {struct v4l2_m2m_buffer *b;unsigned long flags;
@@ -149,7 +149,7 @@ void *v4l2_m2m_next_buf(struct v4l2_m2m_queue_ctx *q_ctx) }EXPORT_SYMBOL_GPL (v4l2_m2m_next_buf); -void *v4l2_m2m_last_buf (struct v4l2_m2m_queue_ctx *q_ctx) +struct vb2_v4l2_buffer *v4l2_m2m_last_buf (struct v4l2_m2m_queue_ctx *q_ctx) {struct v4l2_m2m_buffer *b;unsigned long flags;
@@ -167,7 +167,7 @@ void *v4l2_m2m_last_buf(struct v4l2_m2m_queue_ctx *q_ctx) }EXPORT_SYMBOL_GPL (v4l2_m2m_last_buf); -void *v4l2_m2m_buf_remove (struct v4l2_m2m_queue_ctx *q_ctx) +struct vb2_v4l2_buffer *v4l2_m2m_buf_remove (struct v4l2_m2m_queue_ctx *q_ctx) {struct v4l2_m2m_buffer *b;unsigned long flags;
include/media/v4l2-mem2mem.h +9 -9
@@ -425,7 +425,7 @@ unsigned int v4l2_m2m_num_dst_bufs_ready(struct v4l2_m2m_ctx *m2m_ctx)* * @q_ctx: pointer to struct @v4l2_m2m_queue_ctx */ -void *v4l2_m2m_next_buf (struct v4l2_m2m_queue_ctx *q_ctx); +struct vb2_v4l2_buffer *v4l2_m2m_next_buf (struct v4l2_m2m_queue_ctx *q_ctx);/** * v4l2_m2m_next_src_buf() - return next source buffer from the list of ready
@@ -433,7 +433,7 @@ void *v4l2_m2m_next_buf(struct v4l2_m2m_queue_ctx *q_ctx);* * @m2m_ctx: m2m context assigned to the instance given by struct &v4l2_m2m_ctx */ -static inline void *v4l2_m2m_next_src_buf (struct v4l2_m2m_ctx *m2m_ctx) +static inline struct vb2_v4l2_buffer *v4l2_m2m_next_src_buf (struct v4l2_m2m_ctx *m2m_ctx) {return v4l2_m2m_next_buf (&m2m_ctx->out_q_ctx); }
@@ -444,7 +444,7 @@ static inline void *v4l2_m2m_next_src_buf(struct v4l2_m2m_ctx *m2m_ctx)* * @m2m_ctx: m2m context assigned to the instance given by struct &v4l2_m2m_ctx */ -static inline void *v4l2_m2m_next_dst_buf (struct v4l2_m2m_ctx *m2m_ctx) +static inline struct vb2_v4l2_buffer *v4l2_m2m_next_dst_buf (struct v4l2_m2m_ctx *m2m_ctx) {return v4l2_m2m_next_buf (&m2m_ctx->cap_q_ctx); }
@@ -454,7 +454,7 @@ static inline void *v4l2_m2m_next_dst_buf(struct v4l2_m2m_ctx *m2m_ctx)* * @q_ctx: pointer to struct @v4l2_m2m_queue_ctx */ -void *v4l2_m2m_last_buf (struct v4l2_m2m_queue_ctx *q_ctx); +struct vb2_v4l2_buffer *v4l2_m2m_last_buf (struct v4l2_m2m_queue_ctx *q_ctx);/** * v4l2_m2m_last_src_buf() - return last destination buffer from the list of
@@ -462,7 +462,7 @@ void *v4l2_m2m_last_buf(struct v4l2_m2m_queue_ctx *q_ctx);* * @m2m_ctx: m2m context assigned to the instance given by struct &v4l2_m2m_ctx */ -static inline void *v4l2_m2m_last_src_buf (struct v4l2_m2m_ctx *m2m_ctx) +static inline struct vb2_v4l2_buffer *v4l2_m2m_last_src_buf (struct v4l2_m2m_ctx *m2m_ctx) {return v4l2_m2m_last_buf (&m2m_ctx->out_q_ctx); }
@@ -473,7 +473,7 @@ static inline void *v4l2_m2m_last_src_buf(struct v4l2_m2m_ctx *m2m_ctx)* * @m2m_ctx: m2m context assigned to the instance given by struct &v4l2_m2m_ctx */ -static inline void *v4l2_m2m_last_dst_buf (struct v4l2_m2m_ctx *m2m_ctx) +static inline struct vb2_v4l2_buffer *v4l2_m2m_last_dst_buf (struct v4l2_m2m_ctx *m2m_ctx) {return v4l2_m2m_last_buf (&m2m_ctx->cap_q_ctx); }
@@ -547,7 +547,7 @@ struct vb2_queue *v4l2_m2m_get_dst_vq(struct v4l2_m2m_ctx *m2m_ctx)* * @q_ctx: pointer to struct @v4l2_m2m_queue_ctx */ -void *v4l2_m2m_buf_remove (struct v4l2_m2m_queue_ctx *q_ctx); +struct vb2_v4l2_buffer *v4l2_m2m_buf_remove (struct v4l2_m2m_queue_ctx *q_ctx);/** * v4l2_m2m_src_buf_remove() - take off a source buffer from the list of ready
@@ -555,7 +555,7 @@ void *v4l2_m2m_buf_remove(struct v4l2_m2m_queue_ctx *q_ctx);* * @m2m_ctx: m2m context assigned to the instance given by struct &v4l2_m2m_ctx */ -static inline void *v4l2_m2m_src_buf_remove (struct v4l2_m2m_ctx *m2m_ctx) +static inline struct vb2_v4l2_buffer *v4l2_m2m_src_buf_remove (struct v4l2_m2m_ctx *m2m_ctx) {return v4l2_m2m_buf_remove (&m2m_ctx->out_q_ctx); }
@@ -566,7 +566,7 @@ static inline void *v4l2_m2m_src_buf_remove(struct v4l2_m2m_ctx *m2m_ctx)* * @m2m_ctx: m2m context assigned to the instance given by struct &v4l2_m2m_ctx */ -static inline void *v4l2_m2m_dst_buf_remove (struct v4l2_m2m_ctx *m2m_ctx) +static inline struct vb2_v4l2_buffer *v4l2_m2m_dst_buf_remove (struct v4l2_m2m_ctx *m2m_ctx) {return v4l2_m2m_buf_remove (&m2m_ctx->cap_q_ctx); }
Signature · 1 line
2.20.1