github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-24 06:24:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

media: imx355: Remove storing cur_mode in the state

Browse Source 
All the information for the mode is now stored within
the subdev state, so configure the sensor based on that.

Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
This commit is contained in:
Dave Stevenson 2026-07-15 12:43:34 +01:00 committed by Sakari Ailus
parent 9f36cdacfd
commit b7f17b9fe0
1 changed files with 29 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
drivers/media/i2c/imx355.c
View File

@ -173,9 +173,6 @@ struct imx355 {
struct v4l2_ctrl *vflip;
struct v4l2_ctrl *hflip;
/* Current mode */
const struct imx355_mode *cur_mode;
struct imx355_hwcfg *hwcfg;
const struct imx355_clk_params *clk_params;
@ -607,7 +604,7 @@ static int imx355_set_ctrl(struct v4l2_ctrl *ctrl)
switch (ctrl->id) {
case V4L2_CID_VBLANK:
/* Update max exposure while meeting expected vblanking */
max = imx355->cur_mode->height + ctrl->val - IMX355_EXPOSURE_OFFSET;
max = format->height + ctrl->val - IMX355_EXPOSURE_OFFSET;
__v4l2_ctrl_modify_range(imx355->exposure,
imx355->exposure->minimum,
max, imx355->exposure->step, max);
@ -638,7 +635,7 @@ static int imx355_set_ctrl(struct v4l2_ctrl *ctrl)
case V4L2_CID_VBLANK:
/* Update FLL that meets expected vertical blanking */
ret = cci_write(imx355->regmap, IMX355_REG_FLL,
imx355->cur_mode->height + ctrl->val, NULL);
format->height + ctrl->val, NULL);
break;
case V4L2_CID_TEST_PATTERN:
ret = cci_write(imx355->regmap, IMX355_REG_TEST_PATTERN,
@ -724,9 +721,7 @@ imx355_set_pad_format(struct v4l2_subdev *sd,
const struct imx355_mode *mode;
struct v4l2_mbus_framefmt *framefmt;
struct v4l2_rect *crop;
s32 vblank_def;
s64 h_blank;
u32 height;
/*
* Only one bayer order is supported.
@ -750,16 +745,14 @@ imx355_set_pad_format(struct v4l2_subdev *sd,
crop->top = mode->crop.top;
if (fmt->which == V4L2_SUBDEV_FORMAT_ACTIVE) {
imx355->cur_mode = mode;
/* Update limits and set FPS to default */
height = imx355->cur_mode->height;
vblank_def = imx355->cur_mode->fll_def - height;
height = IMX355_FLL_MAX - height;
__v4l2_ctrl_modify_range(imx355->vblank, IMX355_VBLANK_MIN,
height, 1, vblank_def);
__v4l2_ctrl_s_ctrl(imx355->vblank, vblank_def);
IMX355_FLL_MAX - mode->height, 1,
mode->fll_def - mode->height);
__v4l2_ctrl_s_ctrl(imx355->vblank, mode->fll_def - mode->height);
h_blank = mode->llp - mode->width;
h_blank = mode->llp - imx355->cur_mode->width;
/*
* Currently hblank is not changeable.
* So FPS control is done only by vblank.
@ -811,9 +804,11 @@ static int imx355_entity_init_state(struct v4l2_subdev *subdev,
/* Start streaming */
static int imx355_start_streaming(struct imx355 *imx355)
{
const struct imx355_reg_list *reg_list;
const struct v4l2_mbus_framefmt *fmt;
struct v4l2_subdev_state *state;
const struct imx355_mode *mode;
int lane_idx = imx355->hwcfg->num_lanes == 4 ? 0 : 1;
struct v4l2_rect *crop;
u64 link_bitrate;
u8 binning_mode;
int ret = 0;
@ -822,25 +817,29 @@ static int imx355_start_streaming(struct imx355 *imx355)
cci_multi_reg_write(imx355->regmap, imx355_global_regs,
ARRAY_SIZE(imx355_global_regs), &ret);
/* Apply default values of current mode */
mode = imx355->cur_mode;
reg_list = &mode->reg_list;
cci_multi_reg_write(imx355->regmap, reg_list->regs,
reg_list->num_of_regs, &ret);
/* Apply values of current mode */
state = v4l2_subdev_get_locked_active_state(&imx355->sd);
fmt = v4l2_subdev_state_get_format(state, 0);
crop = v4l2_subdev_state_get_crop(state, 0);
mode = v4l2_find_nearest_size(supported_modes,
ARRAY_SIZE(supported_modes),
width, height, fmt->width, fmt->height);
cci_multi_reg_write(imx355->regmap, mode->reg_list.regs,
mode->reg_list.num_of_regs, &ret);
/* Set readout crop and size registers */
cci_write(imx355->regmap, IMX355_REG_X_ADD_START, mode->crop.left,
cci_write(imx355->regmap, IMX355_REG_X_ADD_START, crop->left,
&ret);
cci_write(imx355->regmap, IMX355_REG_Y_ADD_START, mode->crop.top, &ret);
cci_write(imx355->regmap, IMX355_REG_Y_ADD_START, crop->top, &ret);
cci_write(imx355->regmap, IMX355_REG_X_ADD_END,
mode->crop.width + mode->crop.left - 1, &ret);
crop->width + crop->left - 1, &ret);
cci_write(imx355->regmap, IMX355_REG_Y_ADD_END,
mode->crop.height + mode->crop.top - 1, &ret);
cci_write(imx355->regmap, IMX355_REG_X_OUT_SIZE, mode->width, &ret);
cci_write(imx355->regmap, IMX355_REG_Y_OUT_SIZE, mode->height, &ret);
crop->height + crop->top - 1, &ret);
cci_write(imx355->regmap, IMX355_REG_X_OUT_SIZE, fmt->width, &ret);
cci_write(imx355->regmap, IMX355_REG_Y_OUT_SIZE, fmt->height, &ret);
binning_mode = ((mode->crop.width / mode->width) << 4) |
(mode->crop.height / mode->height);
binning_mode = ((crop->width / fmt->width) << 4) |
(crop->height / fmt->height);
cci_write(imx355->regmap, IMX355_REG_BINNING_MODE,
binning_mode == 0x11 ? 0x00 : 0x01, &ret);
cci_write(imx355->regmap, IMX355_REG_BINNING_TYPE, binning_mode, &ret);
@ -871,7 +870,7 @@ static int imx355_start_streaming(struct imx355 *imx355)
/* set line length */
cci_write(imx355->regmap, IMX355_REG_LLP,
imx355->hblank->val + imx355->cur_mode->width, &ret);
imx355->hblank->val + fmt->width, &ret);
/* Apply customized values from user */
if (!ret)
@ -1031,11 +1030,11 @@ static int imx355_init_controls(struct imx355 *imx355)
{
struct v4l2_fwnode_device_properties props;
struct v4l2_ctrl_handler *ctrl_hdlr;
const struct imx355_mode *mode = &supported_modes[0];
s64 exposure_max;
s64 vblank_def;
s64 hblank;
u64 pixel_rate;
const struct imx355_mode *mode;
int ret;
ctrl_hdlr = &imx355->ctrl_handler;
@ -1057,7 +1056,6 @@ static int imx355_init_controls(struct imx355 *imx355)
pixel_rate, pixel_rate, 1, pixel_rate);
/* Initialize vblank/hblank/exposure parameters based on current mode */
mode = imx355->cur_mode;
vblank_def = mode->fll_def - mode->height;
imx355->vblank = v4l2_ctrl_new_std(ctrl_hdlr, &imx355_ctrl_ops,
V4L2_CID_VBLANK, IMX355_VBLANK_MIN,
@ -1250,9 +1248,6 @@ static int imx355_probe(struct i2c_client *client)
goto error_power_off;
}
/* Set default mode to max resolution */
imx355->cur_mode = &supported_modes[0];
ret = imx355_init_controls(imx355);
if (ret) {
dev_err(imx355->dev, "failed to init controls: %d", ret);