openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

media: tvp5150: trigger autodetection on subdev open to reset cropping 

If cropping isn't set explicitly by userspace, reset it to the maximum
possible rectangle in subdevice open if a standard change is detected.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
[m.felsch@pengutronix.de: move code from internal_ops.open() to pad_ops.init_cfg()]
[m.felsch@pengutronix.de: make use of tvp5150_set_default() helper]
Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
Philipp Zabel 2018-06-28 12:20:40 -04:00 committed by Mauro Carvalho Chehab
parent 5cb8294013
commit b440b73373
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/media/i2c/tvp5150.c
View File

@ -60,6 +60,7 @@ struct tvp5150 {
struct regmap *regmap; struct regmap *regmap;
v4l2_std_id norm; /* Current set standard */ v4l2_std_id norm; /* Current set standard */
v4l2_std_id detected_norm;
u32 input; u32 input;
u32 output; u32 output;
int enable; int enable;
@ -1001,6 +1002,27 @@ static int tvp5150_g_mbus_config(struct v4l2_subdev *sd,
/**************************************************************************** /****************************************************************************
V4L2 subdev pad ops V4L2 subdev pad ops
****************************************************************************/ ****************************************************************************/
static int tvp5150_init_cfg(struct v4l2_subdev *sd,
struct v4l2_subdev_pad_config *cfg)
{
struct tvp5150 *decoder = to_tvp5150(sd);
v4l2_std_id std;
/*
* Reset selection to maximum on subdev_open() if autodetection is on
* and a standard change is detected.
*/
if (decoder->norm == V4L2_STD_ALL) {
std = tvp5150_read_std(sd);
if (std != decoder->detected_norm) {
decoder->detected_norm = std;
tvp5150_set_default(std, &decoder->rect);
}
}
return 0;
}
static int tvp5150_enum_mbus_code(struct v4l2_subdev *sd, static int tvp5150_enum_mbus_code(struct v4l2_subdev *sd,
struct v4l2_subdev_pad_config *cfg, struct v4l2_subdev_pad_config *cfg,
struct v4l2_subdev_mbus_code_enum *code) struct v4l2_subdev_mbus_code_enum *code)
@ -1275,6 +1297,7 @@ static const struct v4l2_subdev_vbi_ops tvp5150_vbi_ops = {
}; };
static const struct v4l2_subdev_pad_ops tvp5150_pad_ops = { static const struct v4l2_subdev_pad_ops tvp5150_pad_ops = {
.init_cfg = tvp5150_init_cfg,
.enum_mbus_code = tvp5150_enum_mbus_code, .enum_mbus_code = tvp5150_enum_mbus_code,
.enum_frame_size = tvp5150_enum_frame_size, .enum_frame_size = tvp5150_enum_frame_size,
.set_fmt = tvp5150_fill_fmt, .set_fmt = tvp5150_fill_fmt,
@ -1608,6 +1631,7 @@ static int tvp5150_probe(struct i2c_client *c,
return res; return res;
core->norm = V4L2_STD_ALL; /* Default is autodetect */ core->norm = V4L2_STD_ALL; /* Default is autodetect */
core->detected_norm = V4L2_STD_UNKNOWN;
core->input = TVP5150_COMPOSITE1; core->input = TVP5150_COMPOSITE1;
core->enable = true; core->enable = true;