Commit b791dcfc authored by Dikshita Agarwal's avatar Dikshita Agarwal Committed by Hans Verkuil
Browse files

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.

Reviewed-by: default avatarBryan O'Donoghue <bryan.odonoghue@linaro.org>
Acked-by: default avatarVikash 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: default avatarDikshita Agarwal <quic_dikshita@quicinc.com>
Tested-by: Vikash Garodia <quic_vgarodia@quicinc.com> # on sa8775p-ride
Signed-off-by: default avatarBryan O'Donoghue <bod@kernel.org>
Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
parent b7a89818

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

+8 −3
Original line number Diff line number Diff line
@@ -611,10 +611,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;
@@ -634,6 +637,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);

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

+2 −0
Original line number Diff line number Diff line
@@ -116,6 +116,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;

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

+6 −0
Original line number Diff line number Diff line
@@ -483,6 +483,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);