Skip to content

Commit ef18b36

Browse files
author
Dikshita Agarwal
committed
FROMLIST: media: iris: Add handling for corrupt and drop frames
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. Link: https://lore.kernel.org/linux-arm-msm/20250509-video-iris-hevc-vp9-v5-17-59b4ff7d331c@quicinc.com/ Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> Acked-by: Vikash Garodia <quic_vgarodia@quicinc.com> Tested-by: Neil Armstrong <neil.armstrong@linaro.org> # on SM8550-QRD Tested-by: Neil Armstrong <neil.armstrong@linaro.org> # on SM8550-HDK Tested-by: Neil Armstrong <neil.armstrong@linaro.org> # on SM8650-QRD Tested-by: Neil Armstrong <neil.armstrong@linaro.org> # on SM8650-HDK Tested-by: Vikash Garodia <quic_vgarodia@quicinc.com> # on sa8775p-ride Signed-off-by: Dikshita Agarwal <quic_dikshita@quicinc.com>
1 parent cc859b0 commit ef18b36

3 files changed

Lines changed: 16 additions & 3 deletions

File tree

drivers/media/platform/qcom/iris/iris_buffer.c

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -611,10 +611,13 @@ int iris_vb2_buffer_done(struct iris_inst *inst, struct iris_buffer *buf)
611611

612612
vb2 = &vbuf->vb2_buf;
613613

614-
if (buf->flags & V4L2_BUF_FLAG_ERROR)
614+
if (buf->flags & V4L2_BUF_FLAG_ERROR) {
615615
state = VB2_BUF_STATE_ERROR;
616-
else
617-
state = VB2_BUF_STATE_DONE;
616+
vb2_set_plane_payload(vb2, 0, 0);
617+
vb2->timestamp = 0;
618+
v4l2_m2m_buf_done(vbuf, state);
619+
return 0;
620+
}
618621

619622
vbuf->flags |= buf->flags;
620623

@@ -634,6 +637,8 @@ int iris_vb2_buffer_done(struct iris_inst *inst, struct iris_buffer *buf)
634637
v4l2_m2m_mark_stopped(m2m_ctx);
635638
}
636639
}
640+
641+
state = VB2_BUF_STATE_DONE;
637642
vb2->timestamp = buf->timestamp;
638643
v4l2_m2m_buf_done(vbuf, state);
639644

drivers/media/platform/qcom/iris/iris_hfi_gen1_defines.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,8 @@
116116
#define HFI_FRAME_NOTCODED 0x7f002000
117117
#define HFI_FRAME_YUV 0x7f004000
118118
#define HFI_UNUSED_PICT 0x10000000
119+
#define HFI_BUFFERFLAG_DATACORRUPT 0x00000008
120+
#define HFI_BUFFERFLAG_DROP_FRAME 0x20000000
119121

120122
struct hfi_pkt_hdr {
121123
u32 size;

drivers/media/platform/qcom/iris/iris_hfi_gen1_response.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -483,6 +483,12 @@ static void iris_hfi_gen1_session_ftb_done(struct iris_inst *inst, void *packet)
483483
buf->attr |= BUF_ATTR_DEQUEUED;
484484
buf->attr |= BUF_ATTR_BUFFER_DONE;
485485

486+
if (hfi_flags & HFI_BUFFERFLAG_DATACORRUPT)
487+
flags |= V4L2_BUF_FLAG_ERROR;
488+
489+
if (hfi_flags & HFI_BUFFERFLAG_DROP_FRAME)
490+
flags |= V4L2_BUF_FLAG_ERROR;
491+
486492
buf->flags |= flags;
487493

488494
iris_vb2_buffer_done(inst, buf);

0 commit comments

Comments
 (0)