2022-05-18 03:20:40

by Smitha T Murthy

Subject: [PATCH 16/20] media: s5p-mfc: Fix to handle reference queue during finishing

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.

Cc: [email protected]
Signed-off-by: Smitha T Murthy <[email protected]>
---
drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.c
index 95e18f1cabb0..91b7ff07feff 100644
--- a/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.c
+++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.c
@@ -1411,6 +1411,7 @@ static int enc_post_frame_start(struct s5p_mfc_ctx *ctx)
unsigned long mb_y_addr, mb_c_addr, mb_c_1_addr;
int slice_type;
unsigned int strm_size;
+ bool src_ready;

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);
@@ -1464,7 +1465,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,
list);
if (mb_entry->flags & MFC_BUF_FLAG_USED) {
@@ -1495,7 +1497,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_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);

return 0;
--
2.17.1

2022-05-18 04:04:25

by Krzysztof Kozlowski

Subject: Re: [PATCH 16/20] media: s5p-mfc: Fix to handle reference queue during finishing

On 17/05/2022 14:55, Smitha T Murthy wrote:
> 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.

What type of wrapping is it exactly?

https://elixir.bootlin.com/linux/v5.18-rc4/source/Documentation/process/submitting-patches.rst#L586

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

This looks like a bugfix so:
1. Send it separately please.
2. Add Fixes tag.
3. Add Cc stable tag.

Best regards,
Krzysztof