Commit 8160e867 authored by Sakari Ailus's avatar Sakari Ailus Committed by Mauro Carvalho Chehab
Browse files

media: ipu3-cio2: Return actual subdev format 



Return actual subdev format on ipu3-cio2 subdev pads. The earlier
implementation was based on an infinite recursion that exhausted the
stack.

Reported-by: default avatarTsuchiya Yuto <kitakar@gmail.com>
Fixes: c2a6a07a ("media: intel-ipu3: cio2: add new MIPI-CSI2 driver")
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarBingbu Cao <bingbu.cao@intel.com>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Cc: stable@vger.kernel.org # v4.16 and up
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent db8e94e7

drivers/media/pci/intel/ipu3/ipu3-cio2.c

+3 −21
Original line number Diff line number Diff line
@@ -1232,28 +1232,10 @@ static int cio2_subdev_get_fmt(struct v4l2_subdev *sd, 
			       struct v4l2_subdev_format *fmt)

{

	struct cio2_queue *q = container_of(sd, struct cio2_queue, subdev);

	struct v4l2_subdev_format format;

	int ret;



	if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {

	if (fmt->which == V4L2_SUBDEV_FORMAT_TRY)

		fmt->format = *v4l2_subdev_get_try_format(sd, cfg, fmt->pad);

		return 0;

	}



	if (fmt->pad == CIO2_PAD_SINK) {

		format.which = V4L2_SUBDEV_FORMAT_ACTIVE;

		ret = v4l2_subdev_call(sd, pad, get_fmt, NULL,

				       &format);



		if (ret)

			return ret;

		/* update colorspace etc */

		q->subdev_fmt.colorspace = format.format.colorspace;

		q->subdev_fmt.ycbcr_enc = format.format.ycbcr_enc;

		q->subdev_fmt.quantization = format.format.quantization;

		q->subdev_fmt.xfer_func = format.format.xfer_func;

	}



	else

		fmt->format = q->subdev_fmt;



	return 0;