Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6016498f authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

[media] v4l: omap4iss: Propagate stop timeouts from submodules to the driver core 



Return an error from the s_stream handlers when stopping the stream
failed instead of just logging the error and ignoring it. While we're
at it, move the logging code from submodules to the driver code.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 0b1d4249

drivers/staging/media/omap4iss/iss.c

+9 −2
Original line number Diff line number Diff line
@@ -614,6 +614,8 @@ static int iss_pipeline_disable(struct iss_pipeline *pipe) 
	struct media_entity *entity;

	struct media_pad *pad;

	struct v4l2_subdev *subdev;

	int failure = 0;

	int ret;



	entity = &pipe->output->video.entity;

	while (1) {
@@ -629,10 +631,15 @@ static int iss_pipeline_disable(struct iss_pipeline *pipe) 
		entity = pad->entity;

		subdev = media_entity_to_v4l2_subdev(entity);



		v4l2_subdev_call(subdev, video, s_stream, 0);

		ret = v4l2_subdev_call(subdev, video, s_stream, 0);

		if (ret < 0) {

			dev_dbg(iss->dev, "%s: module stop timeout.\n",

				subdev->name);

			failure = -ETIMEDOUT;

		}

	}



	return 0;

	return failure;

}



/*

drivers/staging/media/omap4iss/iss_csi2.c

+3 −5
Original line number Diff line number Diff line
@@ -1056,6 +1056,7 @@ static int csi2_set_stream(struct v4l2_subdev *sd, int enable) 
	struct iss_device *iss = csi2->iss;

	struct iss_pipeline *pipe = to_iss_pipeline(&csi2->subdev.entity);

	struct iss_video *video_out = &csi2->video_out;

	int ret = 0;



	if (csi2->state == ISS_PIPELINE_STREAM_STOPPED) {

		if (enable == ISS_PIPELINE_STREAM_STOPPED)
@@ -1069,8 +1070,6 @@ static int csi2_set_stream(struct v4l2_subdev *sd, int enable) 


	switch (enable) {

	case ISS_PIPELINE_STREAM_CONTINUOUS: {

		int ret;



		ret = omap4iss_csiphy_config(iss, sd);

		if (ret < 0)

			return ret;
@@ -1102,8 +1101,7 @@ static int csi2_set_stream(struct v4l2_subdev *sd, int enable) 
			return 0;

		if (omap4iss_module_sync_idle(&sd->entity, &csi2->wait,

					      &csi2->stopping))

			dev_dbg(iss->dev, "%s: module stop timeout.\n",

				sd->name);

			ret = -ETIMEDOUT;

		csi2_ctx_enable(csi2, 0, 0);

		csi2_if_enable(csi2, 0);

		csi2_irq_ctx_set(csi2, 0);
@@ -1117,7 +1115,7 @@ static int csi2_set_stream(struct v4l2_subdev *sd, int enable) 
	}



	csi2->state = enable;

	return 0;

	return ret;

}



/* subdev video operations */

drivers/staging/media/omap4iss/iss_ipipe.c

+1 −2
Original line number Diff line number Diff line
@@ -166,8 +166,7 @@ static int ipipe_set_stream(struct v4l2_subdev *sd, int enable) 
			return 0;

		if (omap4iss_module_sync_idle(&sd->entity, &ipipe->wait,

					      &ipipe->stopping))

			dev_dbg(iss->dev, "%s: module stop timeout.\n",

				sd->name);

			ret = -ETIMEDOUT;



		ipipe_enable(ipipe, 0);

		omap4iss_isp_disable_interrupts(iss);

drivers/staging/media/omap4iss/iss_ipipeif.c

+1 −2
Original line number Diff line number Diff line
@@ -363,8 +363,7 @@ static int ipipeif_set_stream(struct v4l2_subdev *sd, int enable) 
			return 0;

		if (omap4iss_module_sync_idle(&sd->entity, &ipipeif->wait,

					      &ipipeif->stopping))

			dev_dbg(iss->dev, "%s: module stop timeout.\n",

				sd->name);

			ret = -ETIMEDOUT;



		if (ipipeif->output & IPIPEIF_OUTPUT_MEMORY)

			ipipeif_write_enable(ipipeif, 0);

drivers/staging/media/omap4iss/iss_resizer.c

+1 −2
Original line number Diff line number Diff line
@@ -416,8 +416,7 @@ static int resizer_set_stream(struct v4l2_subdev *sd, int enable) 
			return 0;

		if (omap4iss_module_sync_idle(&sd->entity, &resizer->wait,

					      &resizer->stopping))

			dev_dbg(iss->dev, "%s: module stop timeout.\n",

				sd->name);

			ret = -ETIMEDOUT;



		resizer_enable(resizer, 0);

		omap4iss_isp_disable_interrupts(iss);