On 4/28/2025 2:58 PM, Dikshita Agarwal wrote:
> Firmware attach DATACORRUPT/DROP buffer flags for the frames which
> needs to be dropped, handle it by setting VB2_BUF_STATE_ERROR for these
> buffers before calling buf_done.
>
> Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
> Signed-off-by: Dikshita Agarwal <quic_dikshita@quicinc.com>
> ---
> drivers/media/platform/qcom/iris/iris_buffer.c | 11 ++++++++---
> drivers/media/platform/qcom/iris/iris_hfi_gen1_defines.h | 2 ++
> drivers/media/platform/qcom/iris/iris_hfi_gen1_response.c | 6 ++++++
> 3 files changed, 16 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/media/platform/qcom/iris/iris_buffer.c b/drivers/media/platform/qcom/iris/iris_buffer.c
> index 606d76b10be2..3691b68ea294 100644
> --- a/drivers/media/platform/qcom/iris/iris_buffer.c
> +++ b/drivers/media/platform/qcom/iris/iris_buffer.c
> @@ -628,10 +628,13 @@ int iris_vb2_buffer_done(struct iris_inst *inst, struct iris_buffer *buf)
>
> vb2 = &vbuf->vb2_buf;
>
> - if (buf->flags & V4L2_BUF_FLAG_ERROR)
> + if (buf->flags & V4L2_BUF_FLAG_ERROR) {
> state = VB2_BUF_STATE_ERROR;
> - else
> - state = VB2_BUF_STATE_DONE;
> + vb2_set_plane_payload(vb2, 0, 0);
> + vb2->timestamp = 0;
> + v4l2_m2m_buf_done(vbuf, state);
> + return 0;
> + }
>
> vbuf->flags |= buf->flags;
>
> @@ -651,6 +654,8 @@ int iris_vb2_buffer_done(struct iris_inst *inst, struct iris_buffer *buf)
> v4l2_m2m_mark_stopped(m2m_ctx);
> }
> }
> +
> + state = VB2_BUF_STATE_DONE;
> vb2->timestamp = buf->timestamp;
> v4l2_m2m_buf_done(vbuf, state);
>
> diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen1_defines.h b/drivers/media/platform/qcom/iris/iris_hfi_gen1_defines.h
> index 9f246816a286..93b5f838c290 100644
> --- a/drivers/media/platform/qcom/iris/iris_hfi_gen1_defines.h
> +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen1_defines.h
> @@ -117,6 +117,8 @@
> #define HFI_FRAME_NOTCODED 0x7f002000
> #define HFI_FRAME_YUV 0x7f004000
> #define HFI_UNUSED_PICT 0x10000000
> +#define HFI_BUFFERFLAG_DATACORRUPT 0x00000008
> +#define HFI_BUFFERFLAG_DROP_FRAME 0x20000000
>
> struct hfi_pkt_hdr {
> u32 size;
> 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 b72d503dd740..91d95eed68aa 100644
> --- a/drivers/media/platform/qcom/iris/iris_hfi_gen1_response.c
> +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen1_response.c
> @@ -481,6 +481,12 @@ static void iris_hfi_gen1_session_ftb_done(struct iris_inst *inst, void *packet)
> buf->attr |= BUF_ATTR_DEQUEUED;
> buf->attr |= BUF_ATTR_BUFFER_DONE;
>
> + if (hfi_flags & HFI_BUFFERFLAG_DATACORRUPT)
> + flags |= V4L2_BUF_FLAG_ERROR;
> +
> + if (hfi_flags & HFI_BUFFERFLAG_DROP_FRAME)
> + flags |= V4L2_BUF_FLAG_ERROR;
> +
> buf->flags |= flags;
>
> iris_vb2_buffer_done(inst, buf);
>
>
Acked-by: Vikash Garodia <quic_vgarodia@quicinc.com>