Commit 559cd8b8 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

media: ti-vpe: cal: Store sensor-related data in cal_camerarx 



The sensor is connected to the CAMERARX. Store its pointer, as well as
the sensor pixel rate and the endpoint, in the cal_camerarx. This
prepares for decoupling the cal_camerarx and cal_ctx.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: default avatarBenoit Parrot <bparrot@ti.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 6961f5d6

drivers/media/platform/ti-vpe/cal.c

+30 −29
Original line number Diff line number Diff line
@@ -339,6 +339,10 @@ struct cal_camerarx { 


	struct cal_dev		*cal;

	unsigned int		instance;



	struct v4l2_fwnode_endpoint	endpoint;

	struct v4l2_subdev	*sensor;

	unsigned int		external_rate;

};



struct cal_dev {
@@ -369,8 +373,6 @@ struct cal_ctx { 
	struct v4l2_ctrl_handler ctrl_handler;

	struct video_device	vdev;

	struct v4l2_async_notifier notifier;

	struct v4l2_subdev	*sensor;

	struct v4l2_fwnode_endpoint	endpoint;



	struct cal_dev		*cal;

	struct cal_camerarx	*phy;
@@ -394,7 +396,6 @@ struct cal_ctx { 
	unsigned int		num_active_fmt;



	unsigned int		sequence;

	unsigned int		external_rate;

	struct vb2_queue	vb_vidq;

	unsigned int		csi2_port;

	unsigned int		cport;
@@ -587,6 +588,7 @@ static struct cal_camerarx *cc_create(struct cal_dev *cal, 


	phy->cal = cal;

	phy->instance = instance;

	phy->external_rate = 192000000;



	phy->res = platform_get_resource_byname(pdev, IORESOURCE_MEM,

						(instance == 0) ?
@@ -778,12 +780,12 @@ static void csi2_phy_config(struct cal_ctx *ctx) 
	unsigned int ths_term, ths_settle;

	unsigned int csi2_ddrclk_khz;

	struct v4l2_fwnode_bus_mipi_csi2 *mipi_csi2 =

			&ctx->endpoint.bus.mipi_csi2;

			&ctx->phy->endpoint.bus.mipi_csi2;

	u32 num_lanes = mipi_csi2->num_data_lanes;



	/* DPHY timing configuration */

	/* CSI-2 is DDR and we only count used lanes. */

	csi2_ddrclk_khz = ctx->external_rate / 1000

	csi2_ddrclk_khz = ctx->phy->external_rate / 1000

		/ (2 * num_lanes) * ctx->fmt->bpp;

	ctx_dbg(1, ctx, "csi2_ddrclk_khz: %d\n", csi2_ddrclk_khz);
@@ -978,7 +980,7 @@ static void csi2_lane_config(struct cal_ctx *ctx) 
	u32 lane_mask = CAL_CSI2_COMPLEXIO_CFG_CLOCK_POSITION_MASK;

	u32 polarity_mask = CAL_CSI2_COMPLEXIO_CFG_CLOCK_POL_MASK;

	struct v4l2_fwnode_bus_mipi_csi2 *mipi_csi2 =

		&ctx->endpoint.bus.mipi_csi2;

		&ctx->phy->endpoint.bus.mipi_csi2;

	int lane;



	set_field(&val, mipi_csi2->clock_lane + 1, lane_mask);
@@ -1149,22 +1151,22 @@ static void cal_wr_dma_addr(struct cal_ctx *ctx, unsigned int dmaaddr) 
	reg_write(ctx->cal, CAL_WR_DMA_ADDR(ctx->csi2_port), dmaaddr);

}



static int cal_get_external_info(struct cal_ctx *ctx)

static int cal_get_external_info(struct cal_camerarx *phy)

{

	struct v4l2_ctrl *ctrl;



	if (!ctx->sensor)

	if (!phy->sensor)

		return -ENODEV;



	ctrl = v4l2_ctrl_find(ctx->sensor->ctrl_handler, V4L2_CID_PIXEL_RATE);

	ctrl = v4l2_ctrl_find(phy->sensor->ctrl_handler, V4L2_CID_PIXEL_RATE);

	if (!ctrl) {

		ctx_err(ctx, "no pixel rate control in subdev: %s\n",

			ctx->sensor->name);

		phy_err(phy, "no pixel rate control in subdev: %s\n",

			phy->sensor->name);

		return -EPIPE;

	}



	ctx->external_rate = v4l2_ctrl_g_ctrl_int64(ctrl);

	ctx_dbg(3, ctx, "sensor Pixel Rate: %d\n", ctx->external_rate);

	phy->external_rate = v4l2_ctrl_g_ctrl_int64(ctrl);

	phy_dbg(3, phy, "sensor Pixel Rate: %u\n", phy->external_rate);



	return 0;

}
@@ -1319,7 +1321,7 @@ static int __subdev_get_format(struct cal_ctx *ctx, 
	sd_fmt.which = V4L2_SUBDEV_FORMAT_ACTIVE;

	sd_fmt.pad = 0;



	ret = v4l2_subdev_call(ctx->sensor, pad, get_fmt, NULL, &sd_fmt);

	ret = v4l2_subdev_call(ctx->phy->sensor, pad, get_fmt, NULL, &sd_fmt);

	if (ret)

		return ret;
@@ -1342,7 +1344,7 @@ static int __subdev_set_format(struct cal_ctx *ctx, 
	sd_fmt.pad = 0;

	*mbus_fmt = *fmt;



	ret = v4l2_subdev_call(ctx->sensor, pad, set_fmt, NULL, &sd_fmt);

	ret = v4l2_subdev_call(ctx->phy->sensor, pad, set_fmt, NULL, &sd_fmt);

	if (ret)

		return ret;
@@ -1423,7 +1425,7 @@ static int cal_try_fmt_vid_cap(struct file *file, void *priv, 
	fse.code = fmt->code;

	fse.which = V4L2_SUBDEV_FORMAT_ACTIVE;

	for (fse.index = 0; ; fse.index++) {

		ret = v4l2_subdev_call(ctx->sensor, pad, enum_frame_size,

		ret = v4l2_subdev_call(ctx->phy->sensor, pad, enum_frame_size,

				       NULL, &fse);

		if (ret)

			break;
@@ -1521,7 +1523,8 @@ static int cal_enum_framesizes(struct file *file, void *fh, 
	fse.code = fmt->code;

	fse.which = V4L2_SUBDEV_FORMAT_ACTIVE;



	ret = v4l2_subdev_call(ctx->sensor, pad, enum_frame_size, NULL, &fse);

	ret = v4l2_subdev_call(ctx->phy->sensor, pad, enum_frame_size, NULL,

			       &fse);

	if (ret)

		return ret;
@@ -1577,7 +1580,7 @@ static int cal_enum_frameintervals(struct file *file, void *priv, 
		return -EINVAL;



	fie.code = fmt->code;

	ret = v4l2_subdev_call(ctx->sensor, pad, enum_frame_interval,

	ret = v4l2_subdev_call(ctx->phy->sensor, pad, enum_frame_interval,

			       NULL, &fie);

	if (ret)

		return ret;
@@ -1675,11 +1678,11 @@ static int cal_start_streaming(struct vb2_queue *vq, unsigned int count) 
	addr = vb2_dma_contig_plane_dma_addr(&ctx->cur_frm->vb.vb2_buf, 0);

	ctx->sequence = 0;



	ret = cal_get_external_info(ctx);

	ret = cal_get_external_info(ctx->phy);

	if (ret < 0)

		goto err;



	ret = v4l2_subdev_call(ctx->sensor, core, s_power, 1);

	ret = v4l2_subdev_call(ctx->phy->sensor, core, s_power, 1);

	if (ret < 0 && ret != -ENOIOCTLCMD && ret != -ENODEV) {

		ctx_err(ctx, "power on failed in subdev\n");

		goto err;
@@ -1696,9 +1699,9 @@ static int cal_start_streaming(struct vb2_queue *vq, unsigned int count) 
	enable_irqs(ctx);

	csi2_phy_init(ctx);



	ret = v4l2_subdev_call(ctx->sensor, video, s_stream, 1);

	ret = v4l2_subdev_call(ctx->phy->sensor, video, s_stream, 1);

	if (ret) {

		v4l2_subdev_call(ctx->sensor, core, s_power, 0);

		v4l2_subdev_call(ctx->phy->sensor, core, s_power, 0);

		ctx_err(ctx, "stream on failed in subdev\n");

		pm_runtime_put_sync(&ctx->cal->pdev->dev);

		goto err;
@@ -1755,10 +1758,10 @@ static void cal_stop_streaming(struct vb2_queue *vq) 
	disable_irqs(ctx);

	csi2_phy_deinit(ctx);



	if (v4l2_subdev_call(ctx->sensor, video, s_stream, 0))

	if (v4l2_subdev_call(ctx->phy->sensor, video, s_stream, 0))

		ctx_err(ctx, "stream off failed in subdev\n");



	ret = v4l2_subdev_call(ctx->sensor, core, s_power, 0);

	ret = v4l2_subdev_call(ctx->phy->sensor, core, s_power, 0);

	if (ret < 0 && ret != -ENOIOCTLCMD && ret != -ENODEV)

		ctx_err(ctx, "power off failed in subdev\n");
@@ -1849,8 +1852,6 @@ static int cal_complete_ctx(struct cal_ctx *ctx) 
	struct vb2_queue *q;

	int ret;



	ctx->external_rate = 192000000;



	/* initialize locks */

	spin_lock_init(&ctx->slock);

	mutex_init(&ctx->mutex);
@@ -1906,13 +1907,13 @@ static int cal_async_bound(struct v4l2_async_notifier *notifier, 
	unsigned int i, j, k;

	int ret = 0;



	if (ctx->sensor) {

	if (ctx->phy->sensor) {

		ctx_info(ctx, "Rejecting subdev %s (Already set!!)",

			 subdev->name);

		return 0;

	}



	ctx->sensor = subdev;

	ctx->phy->sensor = subdev;

	ctx_dbg(1, ctx, "Using sensor %s for capture\n", subdev->name);



	/* Enumerate sub device formats and enable all matching local formats */
@@ -2065,7 +2066,7 @@ static int of_cal_create_instance(struct cal_ctx *ctx, int inst) 


	parent = pdev->dev.of_node;



	endpoint = &ctx->endpoint;

	endpoint = &ctx->phy->endpoint;



	ep_node = NULL;

	port = NULL;

CRA Git | Maintained and supported by SUSTech CRA and CCSE