media: mtk-vcodec: fix access to incorrect planes member
Commit0650a91499
("media: mtk-vcodec: Correct return type for mem2mem buffer helpers") fixed the return types for mem2mem buffer helper functions by changing a few local variables from vb2_buffer to vb2_v4l2_buffer. However, it left a few accesses to vb2_buffer::planes as-is, accidentally turning them into accesses to vb2_v4l2_buffer::planes and resulting in values being read from/written to the wrong place. Fix this by inserting vb2_buf into these accesses so they mimic their original behavior. Fixes:0650a91499
("media: mtk-vcodec: Correct return type for mem2mem buffer helpers") Signed-off-by: Alexandre Courbot <acourbot@chromium.org> Reviewed-by: Ezequiel Garcia <ezequiel@collabora.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
parent
d7a955c8ef
commit
52fafc58c3
|
@ -388,7 +388,7 @@ static void mtk_vdec_worker(struct work_struct *work)
|
||||||
}
|
}
|
||||||
buf.va = vb2_plane_vaddr(&src_buf->vb2_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.dma_addr = vb2_dma_contig_plane_dma_addr(&src_buf->vb2_buf, 0);
|
||||||
buf.size = (size_t)src_buf->planes[0].bytesused;
|
buf.size = (size_t)src_buf->vb2_buf.planes[0].bytesused;
|
||||||
if (!buf.va) {
|
if (!buf.va) {
|
||||||
v4l2_m2m_job_finish(dev->m2m_dev_dec, ctx->m2m_ctx);
|
v4l2_m2m_job_finish(dev->m2m_dev_dec, ctx->m2m_ctx);
|
||||||
mtk_v4l2_err("[%d] id=%d src_addr is NULL!!",
|
mtk_v4l2_err("[%d] id=%d src_addr is NULL!!",
|
||||||
|
@ -1155,7 +1155,7 @@ static void vb2ops_vdec_buf_queue(struct vb2_buffer *vb)
|
||||||
|
|
||||||
src_mem.va = vb2_plane_vaddr(&src_buf->vb2_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.dma_addr = vb2_dma_contig_plane_dma_addr(&src_buf->vb2_buf, 0);
|
||||||
src_mem.size = (size_t)src_buf->planes[0].bytesused;
|
src_mem.size = (size_t)src_buf->vb2_buf.planes[0].bytesused;
|
||||||
mtk_v4l2_debug(2,
|
mtk_v4l2_debug(2,
|
||||||
"[%d] buf id=%d va=%p dma=%pad size=%zx",
|
"[%d] buf id=%d va=%p dma=%pad size=%zx",
|
||||||
ctx->id, src_buf->vb2_buf.index,
|
ctx->id, src_buf->vb2_buf.index,
|
||||||
|
|
|
@ -894,7 +894,7 @@ static void vb2ops_venc_stop_streaming(struct vb2_queue *q)
|
||||||
|
|
||||||
if (q->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) {
|
if (q->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) {
|
||||||
while ((dst_buf = v4l2_m2m_dst_buf_remove(ctx->m2m_ctx))) {
|
while ((dst_buf = v4l2_m2m_dst_buf_remove(ctx->m2m_ctx))) {
|
||||||
dst_buf->planes[0].bytesused = 0;
|
dst_buf->vb2_buf.planes[0].bytesused = 0;
|
||||||
v4l2_m2m_buf_done(dst_buf, VB2_BUF_STATE_ERROR);
|
v4l2_m2m_buf_done(dst_buf, VB2_BUF_STATE_ERROR);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
@ -947,7 +947,7 @@ static int mtk_venc_encode_header(void *priv)
|
||||||
|
|
||||||
bs_buf.va = vb2_plane_vaddr(&dst_buf->vb2_buf, 0);
|
bs_buf.va = vb2_plane_vaddr(&dst_buf->vb2_buf, 0);
|
||||||
bs_buf.dma_addr = vb2_dma_contig_plane_dma_addr(&dst_buf->vb2_buf, 0);
|
bs_buf.dma_addr = vb2_dma_contig_plane_dma_addr(&dst_buf->vb2_buf, 0);
|
||||||
bs_buf.size = (size_t)dst_buf->planes[0].length;
|
bs_buf.size = (size_t)dst_buf->vb2_buf.planes[0].length;
|
||||||
|
|
||||||
mtk_v4l2_debug(1,
|
mtk_v4l2_debug(1,
|
||||||
"[%d] buf id=%d va=0x%p dma_addr=0x%llx size=%zu",
|
"[%d] buf id=%d va=0x%p dma_addr=0x%llx size=%zu",
|
||||||
|
@ -976,7 +976,7 @@ static int mtk_venc_encode_header(void *priv)
|
||||||
}
|
}
|
||||||
|
|
||||||
ctx->state = MTK_STATE_HEADER;
|
ctx->state = MTK_STATE_HEADER;
|
||||||
dst_buf->planes[0].bytesused = enc_result.bs_size;
|
dst_buf->vb2_buf.planes[0].bytesused = enc_result.bs_size;
|
||||||
v4l2_m2m_buf_done(dst_buf, VB2_BUF_STATE_DONE);
|
v4l2_m2m_buf_done(dst_buf, VB2_BUF_STATE_DONE);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -1107,12 +1107,12 @@ static void mtk_venc_worker(struct work_struct *work)
|
||||||
|
|
||||||
if (ret) {
|
if (ret) {
|
||||||
v4l2_m2m_buf_done(src_buf, VB2_BUF_STATE_ERROR);
|
v4l2_m2m_buf_done(src_buf, VB2_BUF_STATE_ERROR);
|
||||||
dst_buf->planes[0].bytesused = 0;
|
dst_buf->vb2_buf.planes[0].bytesused = 0;
|
||||||
v4l2_m2m_buf_done(dst_buf, VB2_BUF_STATE_ERROR);
|
v4l2_m2m_buf_done(dst_buf, VB2_BUF_STATE_ERROR);
|
||||||
mtk_v4l2_err("venc_if_encode failed=%d", ret);
|
mtk_v4l2_err("venc_if_encode failed=%d", ret);
|
||||||
} else {
|
} else {
|
||||||
v4l2_m2m_buf_done(src_buf, VB2_BUF_STATE_DONE);
|
v4l2_m2m_buf_done(src_buf, VB2_BUF_STATE_DONE);
|
||||||
dst_buf->planes[0].bytesused = enc_result.bs_size;
|
dst_buf->vb2_buf.planes[0].bytesused = enc_result.bs_size;
|
||||||
v4l2_m2m_buf_done(dst_buf, VB2_BUF_STATE_DONE);
|
v4l2_m2m_buf_done(dst_buf, VB2_BUF_STATE_DONE);
|
||||||
mtk_v4l2_debug(2, "venc_if_encode bs size=%d",
|
mtk_v4l2_debug(2, "venc_if_encode bs size=%d",
|
||||||
enc_result.bs_size);
|
enc_result.bs_size);
|
||||||
|
|
Loading…
Reference in a new issue