Commit af2dabab authored Jun 14, 2022 by Laurent Pinchart Committed by Mauro Carvalho Chehab Jul 17, 2022

media: rkisp1: Reject sensors without pixel rate control at bound time



The rkisp1 driver requires the sensor to implement the pixel rate
control. Trying to operate without it will cause an error when starting
streaming. Catch the issue earlier, at bound time.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Dafna Hirschfeld <dafna@fastmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

parent deaf1120

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -190,6 +190,12 @@ static int rkisp1_subdev_notifier_bound(struct v4l2_async_notifier *notifier,

		s_asd->pixel_rate_ctrl = v4l2_ctrl_find(sd->ctrl_handler,
		V4L2_CID_PIXEL_RATE);
		if (!s_asd->pixel_rate_ctrl) {
		dev_err(rkisp1->dev, "No pixel rate control in subdev %s\n",
		sd->name);
		return -EINVAL;
		}

		s_asd->sd = sd;
		s_asd->dphy = devm_phy_get(rkisp1->dev, "dphy");
		if (IS_ERR(s_asd->dphy)) {

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

+0 −5

Original line number	Diff line number	Diff line
		@@ -823,11 +823,6 @@ static int rkisp1_mipi_csi2_start(struct rkisp1_isp *isp,
		struct phy_configure_opts_mipi_dphy *cfg = &opts.mipi_dphy;
		s64 pixel_clock;

		if (!sensor->pixel_rate_ctrl) {
		dev_warn(rkisp1->dev, "No pixel rate control in sensor subdev\n");
		return -EPIPE;
		}

		pixel_clock = v4l2_ctrl_g_ctrl_int64(sensor->pixel_rate_ctrl);
		if (!pixel_clock) {
		dev_err(rkisp1->dev, "Invalid pixel rate value\n");