media: iris: Add handling for corrupt and drop frames

[ Upstream commit b791dcfcba3a0c46fb3e2decab31d2340c5dc313 ]

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>
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
Signed-off-by: Dikshita Agarwal <quic_dikshita@quicinc.com>
Tested-by: Vikash Garodia <quic_vgarodia@quicinc.com> # on sa8775p-ride
Signed-off-by: Bryan O'Donoghue <bod@kernel.org>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/media/platform/qcom/iris/iris_buffer.c b/drivers/media/platform/qcom/iris/iris_buffer.c
index e5c5a564fcb81e77746df8c4797a10a07f2ae946..7dd5730a867af7b77144f7134618b16efad653d2 100644 (file)
--- a/drivers/media/platform/qcom/iris/iris_buffer.c
+++ b/drivers/media/platform/qcom/iris/iris_buffer.c
@@ -593,10 +593,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;
 
@@ -616,6 +619,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 9f246816a286200dff465401bee8c51097dda674..93b5f838c2901c68820aa6c410820af7e53ffada 100644 (file)
--- 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 b72d503dd74018c9bce704aae557ccdce326da4c..91d95eed68aa298c515f55465c45e6dbe0a20a8c 100644 (file)
--- 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);