TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

media: s5p-mfc: Fix to handle reference queue during finishing

Browse Source 
[ Upstream commit d8a46bc4e1 ]

On receiving last buffer driver puts MFC to MFCINST_FINISHING state which
in turn skips transferring of frame from SRC to REF queue. This causes
driver to stop MFC encoding and last frame is lost.

This patch guarantees safe handling of frames during MFCINST_FINISHING and
correct clearing of workbit to avoid early stopping of encoding.

Fixes: af93574678 ("[media] MFC: Add MFC 5.1 V4L2 driver")

Cc: stable@vger.kernel.org
Cc: linux-fsd@tesla.com
Signed-off-by: Smitha T Murthy <smitha.t@samsung.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Smitha T Murthy
2022-09-07 16:02:27 +05:30
committed by Greg Kroah-Hartman
parent 97e7896000
commit dcd1a4ade5
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
+10 -2
View File
@@ -1218,6 +1218,7 @@ static int enc_post_frame_start(struct s5p_mfc_ctx *ctx)
unsigned long mb_y_addr, mb_c_addr; unsigned long mb_y_addr, mb_c_addr;
int slice_type; int slice_type;
unsigned int strm_size; unsigned int strm_size;
bool src_ready;
slice_type = s5p_mfc_hw_call(dev->mfc_ops, get_enc_slice_type, dev); slice_type = s5p_mfc_hw_call(dev->mfc_ops, get_enc_slice_type, dev);
strm_size = s5p_mfc_hw_call(dev->mfc_ops, get_enc_strm_size, dev); strm_size = s5p_mfc_hw_call(dev->mfc_ops, get_enc_strm_size, dev);
@@ -1257,7 +1258,8 @@ static int enc_post_frame_start(struct s5p_mfc_ctx *ctx)
} }
} }
} }
if ((ctx->src_queue_cnt > 0) && (ctx->state == MFCINST_RUNNING)) { if (ctx->src_queue_cnt > 0 && (ctx->state == MFCINST_RUNNING ||
ctx->state == MFCINST_FINISHING)) {
mb_entry = list_entry(ctx->src_queue.next, struct s5p_mfc_buf, mb_entry = list_entry(ctx->src_queue.next, struct s5p_mfc_buf,
list); list);
if (mb_entry->flags & MFC_BUF_FLAG_USED) { if (mb_entry->flags & MFC_BUF_FLAG_USED) {
@@ -1288,7 +1290,13 @@ static int enc_post_frame_start(struct s5p_mfc_ctx *ctx)
vb2_set_plane_payload(&mb_entry->b->vb2_buf, 0, strm_size); vb2_set_plane_payload(&mb_entry->b->vb2_buf, 0, strm_size);
vb2_buffer_done(&mb_entry->b->vb2_buf, VB2_BUF_STATE_DONE); vb2_buffer_done(&mb_entry->b->vb2_buf, VB2_BUF_STATE_DONE);
} }
if ((ctx->src_queue_cnt == 0) || (ctx->dst_queue_cnt == 0))
src_ready = true;
if (ctx->state == MFCINST_RUNNING && ctx->src_queue_cnt == 0)
src_ready = false;
if (ctx->state == MFCINST_FINISHING && ctx->ref_queue_cnt == 0)
src_ready = false;
if (!src_ready || ctx->dst_queue_cnt == 0)
clear_work_bit(ctx); clear_work_bit(ctx);
return 0; return 0;