On 4/28/2025 2:58 PM, Dikshita Agarwal wrote:
> Improve the handling of the V4L2_BUF_FLAG_LAST flag in the driver:
> - Ensure that the last flag is not sent multiple times.
> - Attach the last flag to the first capture buffer returned during
> flush, triggered by a sequence change, addressing cases where the
> firmware does not set the last flag.
>
> Signed-off-by: Dikshita Agarwal <quic_dikshita@quicinc.com>
> ---
> drivers/media/platform/qcom/iris/iris_buffer.c | 1 +
> drivers/media/platform/qcom/iris/iris_hfi_gen1_response.c | 8 +++++++-
> drivers/media/platform/qcom/iris/iris_instance.h | 2 ++
> drivers/media/platform/qcom/iris/iris_vb2.c | 3 ++-
> drivers/media/platform/qcom/iris/iris_vdec.c | 2 ++
> 5 files changed, 14 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/media/platform/qcom/iris/iris_buffer.c b/drivers/media/platform/qcom/iris/iris_buffer.c
> index 3691b68ea294..9f7d890262c2 100644
> --- a/drivers/media/platform/qcom/iris/iris_buffer.c
> +++ b/drivers/media/platform/qcom/iris/iris_buffer.c
> @@ -653,6 +653,7 @@ int iris_vb2_buffer_done(struct iris_inst *inst, struct iris_buffer *buf)
> v4l2_event_queue_fh(&inst->fh, &ev);
> v4l2_m2m_mark_stopped(m2m_ctx);
> }
> + inst->last_buffer_dequeued = true;
> }
>
> state = VB2_BUF_STATE_DONE;
> diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen1_response.c b/drivers/media/platform/qcom/iris/iris_hfi_gen1_response.c
> index 6576496fdbdf..ba858abab336 100644
> --- a/drivers/media/platform/qcom/iris/iris_hfi_gen1_response.c
> +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen1_response.c
> @@ -456,7 +456,13 @@ static void iris_hfi_gen1_session_ftb_done(struct iris_inst *inst, void *packet)
> timestamp_us = timestamp_hi;
> timestamp_us = (timestamp_us << 32) | timestamp_lo;
> } else {
> - flags |= V4L2_BUF_FLAG_LAST;
> + if (pkt->stream_id == 1 && !inst->last_buffer_dequeued) {
> + if (inst->sub_state & IRIS_INST_SUB_DRC &&
> + inst->sub_state & IRIS_INST_SUB_DRC_LAST) {
use iris_drc_pending().
With this added, mark it
Reviewed-by: Vikash Garodia <quic_vgarodia@quicinc.com>
> + flags |= V4L2_BUF_FLAG_LAST;
> + inst->last_buffer_dequeued = true;
> + }
> + }
> }
> buf->timestamp = timestamp_us;
>
> diff --git a/drivers/media/platform/qcom/iris/iris_instance.h b/drivers/media/platform/qcom/iris/iris_instance.h
> index a893751766ca..5150237f0020 100644
> --- a/drivers/media/platform/qcom/iris/iris_instance.h
> +++ b/drivers/media/platform/qcom/iris/iris_instance.h
> @@ -43,6 +43,7 @@
> * @tss: timestamp metadata
> * @metadata_idx: index for metadata buffer
> * @in_reconfig: a flag raised by decoder when the stream resolution changes
> + * @last_buffer_dequeued: a flag to indicate that last buffer is sent by driver
> */
>
> struct iris_inst {
> @@ -74,6 +75,7 @@ struct iris_inst {
> struct iris_ts_metadata tss[VIDEO_MAX_FRAME];
> u32 metadata_idx;
> bool in_reconfig;
> + bool last_buffer_dequeued;
> };
>
> #endif
> diff --git a/drivers/media/platform/qcom/iris/iris_vb2.c b/drivers/media/platform/qcom/iris/iris_vb2.c
> index cdf11feb590b..23473cbd0b2e 100644
> --- a/drivers/media/platform/qcom/iris/iris_vb2.c
> +++ b/drivers/media/platform/qcom/iris/iris_vb2.c
> @@ -304,7 +304,7 @@ void iris_vb2_buf_queue(struct vb2_buffer *vb2)
> goto exit;
> }
>
> - if (V4L2_TYPE_IS_CAPTURE(vb2->vb2_queue->type)) {
> + if (!inst->last_buffer_dequeued && V4L2_TYPE_IS_CAPTURE(vb2->vb2_queue->type)) {
> if ((inst->sub_state & IRIS_INST_SUB_DRC &&
> inst->sub_state & IRIS_INST_SUB_DRC_LAST) ||
> (inst->sub_state & IRIS_INST_SUB_DRAIN &&
> @@ -318,6 +318,7 @@ void iris_vb2_buf_queue(struct vb2_buffer *vb2)
> v4l2_event_queue_fh(&inst->fh, &eos);
> v4l2_m2m_mark_stopped(m2m_ctx);
> }
> + inst->last_buffer_dequeued = true;
> goto exit;
> }
> }
> diff --git a/drivers/media/platform/qcom/iris/iris_vdec.c b/drivers/media/platform/qcom/iris/iris_vdec.c
> index 46abdc47420f..d162cc9650f5 100644
> --- a/drivers/media/platform/qcom/iris/iris_vdec.c
> +++ b/drivers/media/platform/qcom/iris/iris_vdec.c
> @@ -488,6 +488,8 @@ static int iris_vdec_process_streamon_output(struct iris_inst *inst)
> return ret;
>
> inst->in_reconfig = false;
> + inst->last_buffer_dequeued = false;
> +
> return iris_inst_change_sub_state(inst, clear_sub_state, 0);
> }
>
>