Skip to content

L
linux
Commit fd17e3a9 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files
Options

media: i2c: Use accessors for pad config 'try_*' fields 

The 'try_*' fields of the v4l2_subdev_pad_config structure are meant to
be accessed through helper functions. Replace direct access with usage
of the v4l2_subdev_get_pad_format(), v4l2_subdev_get_pad_crop() and
v4l2_subdev_get_pad_compose() helpers.
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 0623979d
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 33 deletions
drivers/media/i2c/adv7183.c
View file @ fd17e3a9
...@@ -443,7 +443,7 @@ static int adv7183_set_fmt(struct v4l2_subdev *sd, ...@@ -443,7 +443,7 @@ static int adv7183_set_fmt(struct v4l2_subdev *sd,
if (format->which == V4L2_SUBDEV_FORMAT_ACTIVE) if (format->which == V4L2_SUBDEV_FORMAT_ACTIVE)
decoder->fmt = *fmt; decoder->fmt = *fmt;
else else
sd_state->pads->try_fmt = *fmt; *v4l2_subdev_get_pad_format(sd, sd_state, 0) = *fmt;
return 0; return 0;
} }
......
drivers/media/i2c/imx274.c
View file @ fd17e3a9
...@@ -1018,8 +1018,8 @@ static int __imx274_change_compose(struct stimx274 *imx274, ...@@ -1018,8 +1018,8 @@ static int __imx274_change_compose(struct stimx274 *imx274,
int best_goodness = INT_MIN; int best_goodness = INT_MIN;
if (which == V4L2_SUBDEV_FORMAT_TRY) { if (which == V4L2_SUBDEV_FORMAT_TRY) {
cur_crop = &sd_state->pads->try_crop; cur_crop = v4l2_subdev_get_pad_crop(&imx274->sd, sd_state, 0);
tgt_fmt = &sd_state->pads->try_fmt; tgt_fmt = v4l2_subdev_get_pad_format(&imx274->sd, sd_state, 0);
} else { } else {
cur_crop = &imx274->crop; cur_crop = &imx274->crop;
tgt_fmt = &imx274->format; tgt_fmt = &imx274->format;
...@@ -1112,7 +1112,7 @@ static int imx274_set_fmt(struct v4l2_subdev *sd, ...@@ -1112,7 +1112,7 @@ static int imx274_set_fmt(struct v4l2_subdev *sd,
*/ */
fmt->field = V4L2_FIELD_NONE; fmt->field = V4L2_FIELD_NONE;
if (format->which == V4L2_SUBDEV_FORMAT_TRY) if (format->which == V4L2_SUBDEV_FORMAT_TRY)
sd_state->pads->try_fmt = *fmt; *v4l2_subdev_get_pad_format(sd, sd_state, 0) = *fmt;
else else
imx274->format = *fmt; imx274->format = *fmt;
...@@ -1143,8 +1143,8 @@ static int imx274_get_selection(struct v4l2_subdev *sd, ...@@ -1143,8 +1143,8 @@ static int imx274_get_selection(struct v4l2_subdev *sd,
} }
if (sel->which == V4L2_SUBDEV_FORMAT_TRY) { if (sel->which == V4L2_SUBDEV_FORMAT_TRY) {
src_crop = &sd_state->pads->try_crop; src_crop = v4l2_subdev_get_pad_crop(sd, sd_state, 0);
src_fmt = &sd_state->pads->try_fmt; src_fmt = v4l2_subdev_get_pad_format(sd, sd_state, 0);
} else { } else {
src_crop = &imx274->crop; src_crop = &imx274->crop;
src_fmt = &imx274->format; src_fmt = &imx274->format;
...@@ -1215,7 +1215,7 @@ static int imx274_set_selection_crop(struct stimx274 *imx274, ...@@ -1215,7 +1215,7 @@ static int imx274_set_selection_crop(struct stimx274 *imx274,
sel->r = new_crop; sel->r = new_crop;
if (sel->which == V4L2_SUBDEV_FORMAT_TRY) if (sel->which == V4L2_SUBDEV_FORMAT_TRY)
tgt_crop = &sd_state->pads->try_crop; tgt_crop = v4l2_subdev_get_pad_crop(&imx274->sd, sd_state, 0);
else else
tgt_crop = &imx274->crop; tgt_crop = &imx274->crop;
......
drivers/media/i2c/mt9m001.c
View file @ fd17e3a9
...@@ -405,7 +405,7 @@ static int mt9m001_set_fmt(struct v4l2_subdev *sd, ...@@ -405,7 +405,7 @@ static int mt9m001_set_fmt(struct v4l2_subdev *sd,
if (format->which == V4L2_SUBDEV_FORMAT_ACTIVE) if (format->which == V4L2_SUBDEV_FORMAT_ACTIVE)
return mt9m001_s_fmt(sd, fmt, mf); return mt9m001_s_fmt(sd, fmt, mf);
sd_state->pads->try_fmt = *mf; *v4l2_subdev_get_pad_format(sd, sd_state, 0) = *mf;
return 0; return 0;
} }
......
drivers/media/i2c/mt9m111.c
View file @ fd17e3a9
...@@ -671,7 +671,7 @@ static int mt9m111_set_fmt(struct v4l2_subdev *sd, ...@@ -671,7 +671,7 @@ static int mt9m111_set_fmt(struct v4l2_subdev *sd,
mf->xfer_func = V4L2_XFER_FUNC_DEFAULT; mf->xfer_func = V4L2_XFER_FUNC_DEFAULT;
if (format->which == V4L2_SUBDEV_FORMAT_TRY) { if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
sd_state->pads->try_fmt = *mf; *v4l2_subdev_get_pad_format(sd, sd_state, 0) = *mf;
return 0; return 0;
} }
......
drivers/media/i2c/mt9t112.c
View file @ fd17e3a9
...@@ -982,7 +982,7 @@ static int mt9t112_set_fmt(struct v4l2_subdev *sd, ...@@ -982,7 +982,7 @@ static int mt9t112_set_fmt(struct v4l2_subdev *sd,
if (format->which == V4L2_SUBDEV_FORMAT_ACTIVE) if (format->which == V4L2_SUBDEV_FORMAT_ACTIVE)
return mt9t112_s_fmt(sd, mf); return mt9t112_s_fmt(sd, mf);
sd_state->pads->try_fmt = *mf; *v4l2_subdev_get_pad_format(sd, sd_state, 0) = *mf;
return 0; return 0;
} }
......
drivers/media/i2c/mt9v011.c
View file @ fd17e3a9
...@@ -356,7 +356,7 @@ static int mt9v011_set_fmt(struct v4l2_subdev *sd, ...@@ -356,7 +356,7 @@ static int mt9v011_set_fmt(struct v4l2_subdev *sd,
set_res(sd); set_res(sd);
} else { } else {
sd_state->pads->try_fmt = *fmt; *v4l2_subdev_get_pad_format(sd, sd_state, 0) = *fmt;
} }
return 0; return 0;
......
drivers/media/i2c/mt9v111.c
View file @ fd17e3a9
...@@ -951,7 +951,7 @@ static int mt9v111_set_format(struct v4l2_subdev *subdev, ...@@ -951,7 +951,7 @@ static int mt9v111_set_format(struct v4l2_subdev *subdev,
static int mt9v111_init_cfg(struct v4l2_subdev *subdev, static int mt9v111_init_cfg(struct v4l2_subdev *subdev,
struct v4l2_subdev_state *sd_state) struct v4l2_subdev_state *sd_state)
{ {
sd_state->pads->try_fmt = mt9v111_def_fmt; *v4l2_subdev_get_pad_format(subdev, sd_state, 0) = mt9v111_def_fmt;
return 0; return 0;
} }
......
drivers/media/i2c/ov2640.c
View file @ fd17e3a9
...@@ -988,7 +988,7 @@ static int ov2640_set_fmt(struct v4l2_subdev *sd, ...@@ -988,7 +988,7 @@ static int ov2640_set_fmt(struct v4l2_subdev *sd,
/* select format */ /* select format */
priv->cfmt_code = mf->code; priv->cfmt_code = mf->code;
} else { } else {
sd_state->pads->try_fmt = *mf; *v4l2_subdev_get_pad_format(sd, sd_state, 0) = *mf;
} }
out: out:
mutex_unlock(&priv->lock); mutex_unlock(&priv->lock);
......
drivers/media/i2c/ov2680.c
View file @ fd17e3a9
...@@ -760,9 +760,9 @@ static int ov2680_init_cfg(struct v4l2_subdev *sd, ...@@ -760,9 +760,9 @@ static int ov2680_init_cfg(struct v4l2_subdev *sd,
{ {
struct ov2680_dev *sensor = to_ov2680_dev(sd); struct ov2680_dev *sensor = to_ov2680_dev(sd);
sd_state->pads[0].try_crop = ov2680_default_crop; *v4l2_subdev_get_pad_crop(sd, sd_state, 0) = ov2680_default_crop;
ov2680_fill_format(sensor, &sd_state->pads[0].try_fmt, ov2680_fill_format(sensor, v4l2_subdev_get_pad_format(sd, sd_state, 0),
OV2680_DEFAULT_WIDTH, OV2680_DEFAULT_HEIGHT); OV2680_DEFAULT_WIDTH, OV2680_DEFAULT_HEIGHT);
return 0; return 0;
} }
......
drivers/media/i2c/ov6650.c
View file @ fd17e3a9
...@@ -476,7 +476,7 @@ static int ov6650_get_selection(struct v4l2_subdev *sd, ...@@ -476,7 +476,7 @@ static int ov6650_get_selection(struct v4l2_subdev *sd,
if (sel->which == V4L2_SUBDEV_FORMAT_TRY) { if (sel->which == V4L2_SUBDEV_FORMAT_TRY) {
/* pre-select try crop rectangle */ /* pre-select try crop rectangle */
rect = &sd_state->pads->try_crop; rect = v4l2_subdev_get_pad_crop(sd, sd_state, 0);
} else { } else {
/* pre-select active crop rectangle */ /* pre-select active crop rectangle */
...@@ -531,8 +531,10 @@ static int ov6650_set_selection(struct v4l2_subdev *sd, ...@@ -531,8 +531,10 @@ static int ov6650_set_selection(struct v4l2_subdev *sd,
ov6650_bind_align_crop_rectangle(&sel->r); ov6650_bind_align_crop_rectangle(&sel->r);
if (sel->which == V4L2_SUBDEV_FORMAT_TRY) { if (sel->which == V4L2_SUBDEV_FORMAT_TRY) {
struct v4l2_rect *crop = &sd_state->pads->try_crop; struct v4l2_rect *crop =
struct v4l2_mbus_framefmt *mf = &sd_state->pads->try_fmt; v4l2_subdev_get_pad_crop(sd, sd_state, 0);
struct v4l2_mbus_framefmt *mf =
v4l2_subdev_get_pad_format(sd, sd_state, 0);
/* detect current pad config scaling factor */ /* detect current pad config scaling factor */
bool half_scale = !is_unscaled_ok(mf->width, mf->height, crop); bool half_scale = !is_unscaled_ok(mf->width, mf->height, crop);
...@@ -588,9 +590,12 @@ static int ov6650_get_fmt(struct v4l2_subdev *sd, ...@@ -588,9 +590,12 @@ static int ov6650_get_fmt(struct v4l2_subdev *sd,
/* update media bus format code and frame size */ /* update media bus format code and frame size */
if (format->which == V4L2_SUBDEV_FORMAT_TRY) { if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
mf->width = sd_state->pads->try_fmt.width; struct v4l2_mbus_framefmt *try_fmt =
mf->height = sd_state->pads->try_fmt.height; v4l2_subdev_get_pad_format(sd, sd_state, 0);
mf->code = sd_state->pads->try_fmt.code;
mf->width = try_fmt->width;
mf->height = try_fmt->height;
mf->code = try_fmt->code;
} else { } else {
mf->width = priv->rect.width >> priv->half_scale; mf->width = priv->rect.width >> priv->half_scale;
...@@ -717,23 +722,26 @@ static int ov6650_set_fmt(struct v4l2_subdev *sd, ...@@ -717,23 +722,26 @@ static int ov6650_set_fmt(struct v4l2_subdev *sd,
} }
if (format->which == V4L2_SUBDEV_FORMAT_TRY) if (format->which == V4L2_SUBDEV_FORMAT_TRY)
crop = &sd_state->pads->try_crop; crop = v4l2_subdev_get_pad_crop(sd, sd_state, 0);
else else
crop = &priv->rect; crop = &priv->rect;
half_scale = !is_unscaled_ok(mf->width, mf->height, crop); half_scale = !is_unscaled_ok(mf->width, mf->height, crop);
if (format->which == V4L2_SUBDEV_FORMAT_TRY) { if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
struct v4l2_mbus_framefmt *try_fmt =
v4l2_subdev_get_pad_format(sd, sd_state, 0);
/* store new mbus frame format code and size in pad config */ /* store new mbus frame format code and size in pad config */
sd_state->pads->try_fmt.width = crop->width >> half_scale; try_fmt->width = crop->width >> half_scale;
sd_state->pads->try_fmt.height = crop->height >> half_scale; try_fmt->height = crop->height >> half_scale;
sd_state->pads->try_fmt.code = mf->code; try_fmt->code = mf->code;
/* return default mbus frame format updated with pad config */ /* return default mbus frame format updated with pad config */
*mf = ov6650_def_fmt; *mf = ov6650_def_fmt;
mf->width = sd_state->pads->try_fmt.width; mf->width = try_fmt->width;
mf->height = sd_state->pads->try_fmt.height; mf->height = try_fmt->height;
mf->code = sd_state->pads->try_fmt.code; mf->code = try_fmt->code;
} else { } else {
int ret = 0; int ret = 0;
......
drivers/media/i2c/ov772x.c
View file @ fd17e3a9
...@@ -1220,7 +1220,7 @@ static int ov772x_set_fmt(struct v4l2_subdev *sd, ...@@ -1220,7 +1220,7 @@ static int ov772x_set_fmt(struct v4l2_subdev *sd,
mf->xfer_func = V4L2_XFER_FUNC_DEFAULT; mf->xfer_func = V4L2_XFER_FUNC_DEFAULT;
if (format->which == V4L2_SUBDEV_FORMAT_TRY) { if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
sd_state->pads->try_fmt = *mf; *v4l2_subdev_get_pad_format(sd, sd_state, 0) = *mf;
return 0; return 0;
} }
......
drivers/media/i2c/ov9640.c
View file @ fd17e3a9
...@@ -547,7 +547,7 @@ static int ov9640_set_fmt(struct v4l2_subdev *sd, ...@@ -547,7 +547,7 @@ static int ov9640_set_fmt(struct v4l2_subdev *sd,
if (format->which == V4L2_SUBDEV_FORMAT_ACTIVE) if (format->which == V4L2_SUBDEV_FORMAT_ACTIVE)
return ov9640_s_fmt(sd, mf); return ov9640_s_fmt(sd, mf);
sd_state->pads->try_fmt = *mf; *v4l2_subdev_get_pad_format(sd, sd_state, 0) = *mf;
return 0; return 0;
} }
......
drivers/media/i2c/rj54n1cb0c.c
View file @ fd17e3a9
...@@ -1009,7 +1009,7 @@ static int rj54n1_set_fmt(struct v4l2_subdev *sd, ...@@ -1009,7 +1009,7 @@ static int rj54n1_set_fmt(struct v4l2_subdev *sd,
&mf->height, 84, RJ54N1_MAX_HEIGHT, align, 0); &mf->height, 84, RJ54N1_MAX_HEIGHT, align, 0);
if (format->which == V4L2_SUBDEV_FORMAT_TRY) { if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
sd_state->pads->try_fmt = *mf; *v4l2_subdev_get_pad_format(sd, sd_state, 0) = *mf;
return 0; return 0;
} }
......
drivers/media/i2c/saa6752hs.c
View file @ fd17e3a9
...@@ -595,7 +595,7 @@ static int saa6752hs_set_fmt(struct v4l2_subdev *sd, ...@@ -595,7 +595,7 @@ static int saa6752hs_set_fmt(struct v4l2_subdev *sd,
f->colorspace = V4L2_COLORSPACE_SMPTE170M; f->colorspace = V4L2_COLORSPACE_SMPTE170M;
if (format->which == V4L2_SUBDEV_FORMAT_TRY) { if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
sd_state->pads->try_fmt = *f; *v4l2_subdev_get_pad_format(sd, sd_state, 0) = *f;
return 0; return 0;
} }
......
drivers/media/i2c/tw9910.c
View file @ fd17e3a9
...@@ -829,7 +829,7 @@ static int tw9910_set_fmt(struct v4l2_subdev *sd, ...@@ -829,7 +829,7 @@ static int tw9910_set_fmt(struct v4l2_subdev *sd,
if (format->which == V4L2_SUBDEV_FORMAT_ACTIVE) if (format->which == V4L2_SUBDEV_FORMAT_ACTIVE)
return tw9910_s_fmt(sd, mf); return tw9910_s_fmt(sd, mf);
sd_state->pads->try_fmt = *mf; *v4l2_subdev_get_pad_format(sd, sd_state, 0) = *mf;
return 0; return 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7