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

media: iris: Fix port streaming handling 



The previous check to block capture port streaming before output port
was incorrect and caused some valid usecase to fail. While removing that
check allows capture port to enter streaming independently, it also
introduced firmware errors due to premature queuing of DPB buffers
before the firmware session was fully started which happens only when
streamon is called on output port.

Fix this by deferring DPB buffer queuing to the firmware until both
capture and output are streaming and state is 'STREAMING'.

Fixes: 11712ce7 ("media: iris: implement vb2 streaming ops")
Cc: stable@vger.kernel.org
Reviewed-by: default avatarVikash Garodia <quic_vgarodia@quicinc.com>
Tested-by: Vikash Garodia <quic_vgarodia@quicinc.com> # X1E80100
Reviewed-by: default avatarBryan O'Donoghue <bryan.odonoghue@linaro.org>
Tested-by: Neil Armstrong <neil.armstrong@linaro.org> # on SM8550-HDK
Tested-by: Neil Armstrong <neil.armstrong@linaro.org> # on SM8650-HDK
Signed-off-by: default avatarDikshita Agarwal <quic_dikshita@quicinc.com>
Tested-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> # x1e80100-crd
Signed-off-by: default avatarBryan O'Donoghue <bod@kernel.org>
Signed-off-by: default avatarHans Verkuil <hverkuil+cisco@kernel.org>
parent 02a24f13

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

+27 −0
Original line number Diff line number Diff line
@@ -334,6 +334,29 @@ int iris_queue_buffer(struct iris_inst *inst, struct iris_buffer *buf) 
	return 0;

}



int iris_queue_internal_deferred_buffers(struct iris_inst *inst, enum iris_buffer_type buffer_type)

{

	struct iris_buffer *buffer, *next;

	struct iris_buffers *buffers;

	int ret = 0;



	buffers = &inst->buffers[buffer_type];

	list_for_each_entry_safe(buffer, next, &buffers->list, list) {

		if (buffer->attr & BUF_ATTR_PENDING_RELEASE)

			continue;

		if (buffer->attr & BUF_ATTR_QUEUED)

			continue;



		if (buffer->attr & BUF_ATTR_DEFERRED) {

			ret = iris_queue_buffer(inst, buffer);

			if (ret)

				return ret;

		}

	}



	return ret;

}



int iris_queue_internal_buffers(struct iris_inst *inst, u32 plane)

{

	const struct iris_platform_data *platform_data = inst->core->iris_platform_data;
@@ -358,6 +381,10 @@ int iris_queue_internal_buffers(struct iris_inst *inst, u32 plane) 
				continue;

			if (buffer->attr & BUF_ATTR_QUEUED)

				continue;

			if (buffer->type == BUF_DPB && inst->state != IRIS_INST_STREAMING) {

				buffer->attr |= BUF_ATTR_DEFERRED;

				continue;

			}

			ret = iris_queue_buffer(inst, buffer);

			if (ret)

				return ret;

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

+1 −0
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ int iris_get_buffer_size(struct iris_inst *inst, enum iris_buffer_type buffer_ty 
void iris_get_internal_buffers(struct iris_inst *inst, u32 plane);

int iris_create_internal_buffers(struct iris_inst *inst, u32 plane);

int iris_queue_internal_buffers(struct iris_inst *inst, u32 plane);

int iris_queue_internal_deferred_buffers(struct iris_inst *inst, enum iris_buffer_type buffer_type);

int iris_destroy_internal_buffer(struct iris_inst *inst, struct iris_buffer *buffer);

int iris_destroy_all_internal_buffers(struct iris_inst *inst, u32 plane);

int iris_destroy_dequeued_internal_buffers(struct iris_inst *inst, u32 plane);

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

+4 −4
Original line number Diff line number Diff line
@@ -173,9 +173,6 @@ int iris_vb2_start_streaming(struct vb2_queue *q, unsigned int count) 


	inst = vb2_get_drv_priv(q);



	if (V4L2_TYPE_IS_CAPTURE(q->type) && inst->state == IRIS_INST_INIT)

		return 0;



	mutex_lock(&inst->lock);

	if (inst->state == IRIS_INST_ERROR) {

		ret = -EBUSY;
@@ -203,6 +200,9 @@ int iris_vb2_start_streaming(struct vb2_queue *q, unsigned int count) 


	buf_type = iris_v4l2_type_to_driver(q->type);



	if (inst->state == IRIS_INST_STREAMING)

		ret = iris_queue_internal_deferred_buffers(inst, BUF_DPB);

	if (!ret)

		ret = iris_queue_deferred_buffers(inst, buf_type);

	if (ret)

		goto error;