Commit 71f247da authored by Akinobu Mita's avatar Akinobu Mita Committed by Mauro Carvalho Chehab
Browse files

media: mt9m001: make SUBDEV_G_FMT ioctl work with SUBDEV_FORMAT_TRY 



The VIDIOC_SUBDEV_G_FMT ioctl for this driver doesn't recognize
V4L2_SUBDEV_FORMAT_TRY and always works as if V4L2_SUBDEV_FORMAT_ACTIVE
is specified.

Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarAkinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent dd15f070

drivers/media/i2c/mt9m001.c

+27 −0
Original line number Diff line number Diff line
@@ -329,6 +329,12 @@ static int mt9m001_get_fmt(struct v4l2_subdev *sd, 
	if (format->pad)

		return -EINVAL;



	if (format->which == V4L2_SUBDEV_FORMAT_TRY) {

		mf = v4l2_subdev_get_try_format(sd, cfg, 0);

		format->format = *mf;

		return 0;

	}



	mf->width	= mt9m001->rect.width;

	mf->height	= mt9m001->rect.height;

	mf->code	= mt9m001->fmt->code;
@@ -642,6 +648,26 @@ static const struct v4l2_subdev_core_ops mt9m001_subdev_core_ops = { 
#endif

};



static int mt9m001_init_cfg(struct v4l2_subdev *sd,

			    struct v4l2_subdev_pad_config *cfg)

{

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct mt9m001 *mt9m001 = to_mt9m001(client);

	struct v4l2_mbus_framefmt *try_fmt =

		v4l2_subdev_get_try_format(sd, cfg, 0);



	try_fmt->width		= MT9M001_MAX_WIDTH;

	try_fmt->height		= MT9M001_MAX_HEIGHT;

	try_fmt->code		= mt9m001->fmts[0].code;

	try_fmt->colorspace	= mt9m001->fmts[0].colorspace;

	try_fmt->field		= V4L2_FIELD_NONE;

	try_fmt->ycbcr_enc	= V4L2_YCBCR_ENC_DEFAULT;

	try_fmt->quantization	= V4L2_QUANTIZATION_DEFAULT;

	try_fmt->xfer_func	= V4L2_XFER_FUNC_DEFAULT;



	return 0;

}



static int mt9m001_enum_mbus_code(struct v4l2_subdev *sd,

		struct v4l2_subdev_pad_config *cfg,

		struct v4l2_subdev_mbus_code_enum *code)
@@ -678,6 +704,7 @@ static const struct v4l2_subdev_sensor_ops mt9m001_subdev_sensor_ops = { 
};



static const struct v4l2_subdev_pad_ops mt9m001_subdev_pad_ops = {

	.init_cfg	= mt9m001_init_cfg,

	.enum_mbus_code = mt9m001_enum_mbus_code,

	.get_selection	= mt9m001_get_selection,

	.set_selection	= mt9m001_set_selection,

CRA Git | Maintained and supported by SUSTech CRA and CCSE