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

[media] smiapp: Clean up smiapp_set_format() 



smiapp_set_format() has accumulated a fair amount of changes without a
needed refactoring, do the cleanup now. There's also an unlocked version of
v4l2_ctrl_range_changed(), using that fixes a small serialisation issue with
the user space interface.

__v4l2_ctrl_modify_range() is used instead of v4l2_ctrl_modify_range() in
smiapp_set_format_source() since the mutex is now held during the function
call.

Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent cd78b6af

drivers/media/i2c/smiapp/smiapp-core.c

+43 −30
Original line number Diff line number Diff line
@@ -1728,51 +1728,64 @@ static const struct smiapp_csi_data_format 
	return csi_format;

}



static int smiapp_set_format(struct v4l2_subdev *subdev,

static int smiapp_set_format_source(struct v4l2_subdev *subdev,

				    struct v4l2_subdev_fh *fh,

				    struct v4l2_subdev_format *fmt)

{

	struct smiapp_sensor *sensor = to_smiapp_sensor(subdev);

	struct smiapp_subdev *ssd = to_smiapp_subdev(subdev);

	struct v4l2_rect *crops[SMIAPP_PADS];

	const struct smiapp_csi_data_format *csi_format,

		*old_csi_format = sensor->csi_format;

	u32 code = fmt->format.code;

	unsigned int i;

	int rval;



	mutex_lock(&sensor->mutex);

	rval = __smiapp_get_format(subdev, fh, fmt);

	if (rval)

		return rval;



	/*

	 * Media bus code is changeable on src subdev's source pad. On

	 * other source pads we just get format here.

	 */

	if (fmt->pad == ssd->source_pad) {

		u32 code = fmt->format.code;

		int rval = __smiapp_get_format(subdev, fh, fmt);

		bool range_changed = false;

		unsigned int i;

	if (subdev != &sensor->src->sd)

		return 0;



		if (!rval && subdev == &sensor->src->sd) {

			const struct smiapp_csi_data_format *csi_format =

				smiapp_validate_csi_data_format(sensor, code);

	csi_format = smiapp_validate_csi_data_format(sensor, code);



	fmt->format.code = csi_format->code;



			if (fmt->which == V4L2_SUBDEV_FORMAT_ACTIVE) {

				if (csi_format->width !=

				    sensor->csi_format->width)

					range_changed = true;

	if (fmt->which != V4L2_SUBDEV_FORMAT_ACTIVE)

		return 0;



	sensor->csi_format = csi_format;

			}



			fmt->format.code = csi_format->code;

	if (csi_format->width != old_csi_format->width)

		for (i = 0; i < ARRAY_SIZE(sensor->test_data); i++)

			__v4l2_ctrl_modify_range(

				sensor->test_data[i], 0,

				(1 << csi_format->width) - 1, 1, 0);



	return 0;

}



		mutex_unlock(&sensor->mutex);

		if (rval || !range_changed)

			return rval;

static int smiapp_set_format(struct v4l2_subdev *subdev,

			     struct v4l2_subdev_fh *fh,

			     struct v4l2_subdev_format *fmt)

{

	struct smiapp_sensor *sensor = to_smiapp_sensor(subdev);

	struct smiapp_subdev *ssd = to_smiapp_subdev(subdev);

	struct v4l2_rect *crops[SMIAPP_PADS];



		for (i = 0; i < ARRAY_SIZE(sensor->test_data); i++)

			v4l2_ctrl_modify_range(

				sensor->test_data[i],

				0, (1 << sensor->csi_format->width) - 1, 1, 0);

	mutex_lock(&sensor->mutex);



		return 0;

	if (fmt->pad == ssd->source_pad) {

		int rval;



		rval = smiapp_set_format_source(subdev, fh, fmt);



		mutex_unlock(&sensor->mutex);



		return rval;

	}



	/* Sink pad. Width and height are changeable here. */