Commit 4fd1e6a9 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

media: rkisp1: isp: Start CSI-2 receiver before ISP 



Make sure the ISP is ready to receive data before starting the CSI-2
receiver by starting it first. Similarly, stop the CSI-2 receiver before
the ISP when stopping streaming.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarDafna Hirschfeld <dafna@fastmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 8082e2f4

drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c

+7 −4
Original line number Diff line number Diff line
@@ -771,8 +771,9 @@ static int rkisp1_isp_s_stream(struct v4l2_subdev *sd, int enable) 
		v4l2_subdev_call(rkisp1->active_sensor->sd, video, s_stream,

				 false);



		rkisp1_isp_stop(rkisp1);

		rkisp1_mipi_csi2_stop(&rkisp1->csi);

		rkisp1_isp_stop(rkisp1);



		return 0;

	}
@@ -794,11 +795,13 @@ static int rkisp1_isp_s_stream(struct v4l2_subdev *sd, int enable) 
	if (ret)

		goto mutex_unlock;



	rkisp1_isp_start(rkisp1);



	ret = rkisp1_mipi_csi2_start(&rkisp1->csi, rkisp1->active_sensor);

	if (ret)

	if (ret) {

		rkisp1_isp_stop(rkisp1);

		goto mutex_unlock;



	rkisp1_isp_start(rkisp1);

	}



	ret = v4l2_subdev_call(rkisp1->active_sensor->sd, video, s_stream,

			       true);