| Message ID | 20241021-imx214-v2-10-fbd23e99541e@apitzsch.eu |
|---|---|
| State | Superseded |
| Headers | show |
| Series | media: i2c: imx214: Miscellaneous cleanups and improvements | expand |
On Mon, Oct 21, 2024 at 12:14 AM André Apitzsch via B4 Relay <devnull+git.apitzsch.eu@kernel.org> wrote: > > From: André Apitzsch <git@apitzsch.eu> > > The imx214 sensor supports horizontal and vertical flipping. Add > appropriate controls to the driver. > > Signed-off-by: André Apitzsch <git@apitzsch.eu> Acked-by: Ricardo Ribalda <ribalda@chromium.org> > --- > drivers/media/i2c/imx214.c | 69 ++++++++++++++++++++++++++++++++++++++++------ > 1 file changed, 61 insertions(+), 8 deletions(-) > > diff --git a/drivers/media/i2c/imx214.c b/drivers/media/i2c/imx214.c > index 87a03e292e19ccd71f1b2dcee3409826b2f5cb6f..f2d21c2e8cf84ed25403c98e280073f32e50e758 100644 > --- a/drivers/media/i2c/imx214.c > +++ b/drivers/media/i2c/imx214.c > @@ -30,7 +30,6 @@ > #define IMX214_DEFAULT_LINK_FREQ 600000000 > #define IMX214_DEFAULT_PIXEL_RATE ((IMX214_DEFAULT_LINK_FREQ * 8LL) / 10) > #define IMX214_FPS 30 > -#define IMX214_MBUS_CODE MEDIA_BUS_FMT_SRGGB10_1X10 > > /* V-TIMING internal */ > #define IMX214_REG_FRM_LENGTH_LINES CCI_REG16(0x0340) > @@ -189,6 +188,22 @@ static const char * const imx214_supply_name[] = { > > #define IMX214_NUM_SUPPLIES ARRAY_SIZE(imx214_supply_name) > > +/* > + * The supported formats. > + * This table MUST contain 4 entries per format, to cover the various flip > + * combinations in the order > + * - no flip > + * - h flip > + * - v flip > + * - h&v flips > + */ > +static const u32 imx214_mbus_formats[] = { > + MEDIA_BUS_FMT_SRGGB10_1X10, > + MEDIA_BUS_FMT_SGRBG10_1X10, > + MEDIA_BUS_FMT_SGBRG10_1X10, > + MEDIA_BUS_FMT_SBGGR10_1X10, > +}; > + > struct imx214 { > struct device *dev; > struct clk *xclk; > @@ -204,6 +219,10 @@ struct imx214 { > struct v4l2_ctrl *hblank; > struct v4l2_ctrl *exposure; > struct v4l2_ctrl *unit_size; > + struct { > + struct v4l2_ctrl *hflip; > + struct v4l2_ctrl *vflip; > + }; > > const struct imx214_mode *cur_mode; > > @@ -339,7 +358,6 @@ static const struct cci_reg_sequence mode_table_common[] = { > > /* global setting */ > /* basic config */ > - { IMX214_REG_ORIENTATION, 0 }, > { IMX214_REG_MASK_CORR_FRAMES, IMX214_CORR_FRAMES_MASK }, > { IMX214_REG_FAST_STANDBY_CTRL, 1 }, > { IMX214_REG_LINE_LENGTH_PCK, IMX214_PPL_DEFAULT }, > @@ -518,11 +536,21 @@ static int __maybe_unused imx214_power_off(struct device *dev) > return 0; > } > > +/* Get bayer order based on flip setting. */ > +static u32 imx214_get_format_code(struct imx214 *imx214) > +{ > + unsigned int i; > + > + i = (imx214->vflip->val ? 2 : 0) | (imx214->hflip->val ? 1 : 0); > + > + return imx214_mbus_formats[i]; > +} > + > static void imx214_update_pad_format(struct imx214 *imx214, > const struct imx214_mode *mode, > struct v4l2_mbus_framefmt *fmt, u32 code) > { > - fmt->code = IMX214_MBUS_CODE; > + fmt->code = imx214_get_format_code(imx214); > fmt->width = mode->width; > fmt->height = mode->height; > fmt->field = V4L2_FIELD_NONE; > @@ -538,10 +566,12 @@ static int imx214_enum_mbus_code(struct v4l2_subdev *sd, > struct v4l2_subdev_state *sd_state, > struct v4l2_subdev_mbus_code_enum *code) > { > - if (code->index > 0) > + struct imx214 *imx214 = to_imx214(sd); > + > + if (code->index >= (ARRAY_SIZE(imx214_mbus_formats) / 4)) > return -EINVAL; > > - code->code = IMX214_MBUS_CODE; > + code->code = imx214_get_format_code(imx214); > > return 0; > } > @@ -550,7 +580,11 @@ static int imx214_enum_frame_size(struct v4l2_subdev *subdev, > struct v4l2_subdev_state *sd_state, > struct v4l2_subdev_frame_size_enum *fse) > { > - if (fse->code != IMX214_MBUS_CODE) > + struct imx214 *imx214 = to_imx214(subdev); > + u32 code; > + > + code = imx214_get_format_code(imx214); > + if (fse->code != code) > return -EINVAL; > > if (fse->index >= ARRAY_SIZE(imx214_modes)) > @@ -713,6 +747,7 @@ static int imx214_entity_init_state(struct v4l2_subdev *subdev, > struct v4l2_subdev_format fmt = { }; > > fmt.which = sd_state ? V4L2_SUBDEV_FORMAT_TRY : V4L2_SUBDEV_FORMAT_ACTIVE; > + fmt.format.code = MEDIA_BUS_FMT_SRGGB10_1X10; > fmt.format.width = imx214_modes[0].width; > fmt.format.height = imx214_modes[0].height; > > @@ -755,6 +790,11 @@ static int imx214_set_ctrl(struct v4l2_ctrl *ctrl) > case V4L2_CID_EXPOSURE: > cci_write(imx214->regmap, IMX214_REG_EXPOSURE, ctrl->val, &ret); > break; > + case V4L2_CID_HFLIP: > + case V4L2_CID_VFLIP: > + cci_write(imx214->regmap, IMX214_REG_ORIENTATION, > + imx214->hflip->val | imx214->vflip->val << 1, &ret); > + break; > case V4L2_CID_VBLANK: > cci_write(imx214->regmap, IMX214_REG_FRM_LENGTH_LINES, > format->height + ctrl->val, &ret); > @@ -793,7 +833,7 @@ static int imx214_ctrls_init(struct imx214 *imx214) > return ret; > > ctrl_hdlr = &imx214->ctrls; > - ret = v4l2_ctrl_handler_init(&imx214->ctrls, 8); > + ret = v4l2_ctrl_handler_init(&imx214->ctrls, 10); > if (ret) > return ret; > > @@ -830,6 +870,18 @@ static int imx214_ctrls_init(struct imx214 *imx214) > IMX214_EXPOSURE_STEP, > exposure_def); > > + imx214->hflip = v4l2_ctrl_new_std(ctrl_hdlr, &imx214_ctrl_ops, > + V4L2_CID_HFLIP, 0, 1, 1, 0); > + if (imx214->hflip) > + imx214->hflip->flags |= V4L2_CTRL_FLAG_MODIFY_LAYOUT; > + > + imx214->vflip = v4l2_ctrl_new_std(ctrl_hdlr, &imx214_ctrl_ops, > + V4L2_CID_VFLIP, 0, 1, 1, 0); > + if (imx214->vflip) > + imx214->vflip->flags |= V4L2_CTRL_FLAG_MODIFY_LAYOUT; > + > + v4l2_ctrl_cluster(2, &imx214->hflip); > + > imx214->unit_size = v4l2_ctrl_new_std_compound(ctrl_hdlr, > NULL, > V4L2_CID_UNIT_CELL_SIZE, > @@ -1023,6 +1075,7 @@ static int imx214_enum_frame_interval(struct v4l2_subdev *subdev, > struct v4l2_subdev_state *sd_state, > struct v4l2_subdev_frame_interval_enum *fie) > { > + struct imx214 *imx214 = to_imx214(subdev); > const struct imx214_mode *mode; > > if (fie->index != 0) > @@ -1032,7 +1085,7 @@ static int imx214_enum_frame_interval(struct v4l2_subdev *subdev, > ARRAY_SIZE(imx214_modes), width, height, > fie->width, fie->height); > > - fie->code = IMX214_MBUS_CODE; > + fie->code = imx214_get_format_code(imx214); > fie->width = mode->width; > fie->height = mode->height; > fie->interval.numerator = 1; > > -- > 2.47.0 > >
diff --git a/drivers/media/i2c/imx214.c b/drivers/media/i2c/imx214.c index 87a03e292e19ccd71f1b2dcee3409826b2f5cb6f..f2d21c2e8cf84ed25403c98e280073f32e50e758 100644 --- a/drivers/media/i2c/imx214.c +++ b/drivers/media/i2c/imx214.c @@ -30,7 +30,6 @@ #define IMX214_DEFAULT_LINK_FREQ 600000000 #define IMX214_DEFAULT_PIXEL_RATE ((IMX214_DEFAULT_LINK_FREQ * 8LL) / 10) #define IMX214_FPS 30 -#define IMX214_MBUS_CODE MEDIA_BUS_FMT_SRGGB10_1X10 /* V-TIMING internal */ #define IMX214_REG_FRM_LENGTH_LINES CCI_REG16(0x0340) @@ -189,6 +188,22 @@ static const char * const imx214_supply_name[] = { #define IMX214_NUM_SUPPLIES ARRAY_SIZE(imx214_supply_name) +/* + * The supported formats. + * This table MUST contain 4 entries per format, to cover the various flip + * combinations in the order + * - no flip + * - h flip + * - v flip + * - h&v flips + */ +static const u32 imx214_mbus_formats[] = { + MEDIA_BUS_FMT_SRGGB10_1X10, + MEDIA_BUS_FMT_SGRBG10_1X10, + MEDIA_BUS_FMT_SGBRG10_1X10, + MEDIA_BUS_FMT_SBGGR10_1X10, +}; + struct imx214 { struct device *dev; struct clk *xclk; @@ -204,6 +219,10 @@ struct imx214 { struct v4l2_ctrl *hblank; struct v4l2_ctrl *exposure; struct v4l2_ctrl *unit_size; + struct { + struct v4l2_ctrl *hflip; + struct v4l2_ctrl *vflip; + }; const struct imx214_mode *cur_mode; @@ -339,7 +358,6 @@ static const struct cci_reg_sequence mode_table_common[] = { /* global setting */ /* basic config */ - { IMX214_REG_ORIENTATION, 0 }, { IMX214_REG_MASK_CORR_FRAMES, IMX214_CORR_FRAMES_MASK }, { IMX214_REG_FAST_STANDBY_CTRL, 1 }, { IMX214_REG_LINE_LENGTH_PCK, IMX214_PPL_DEFAULT }, @@ -518,11 +536,21 @@ static int __maybe_unused imx214_power_off(struct device *dev) return 0; } +/* Get bayer order based on flip setting. */ +static u32 imx214_get_format_code(struct imx214 *imx214) +{ + unsigned int i; + + i = (imx214->vflip->val ? 2 : 0) | (imx214->hflip->val ? 1 : 0); + + return imx214_mbus_formats[i]; +} + static void imx214_update_pad_format(struct imx214 *imx214, const struct imx214_mode *mode, struct v4l2_mbus_framefmt *fmt, u32 code) { - fmt->code = IMX214_MBUS_CODE; + fmt->code = imx214_get_format_code(imx214); fmt->width = mode->width; fmt->height = mode->height; fmt->field = V4L2_FIELD_NONE; @@ -538,10 +566,12 @@ static int imx214_enum_mbus_code(struct v4l2_subdev *sd, struct v4l2_subdev_state *sd_state, struct v4l2_subdev_mbus_code_enum *code) { - if (code->index > 0) + struct imx214 *imx214 = to_imx214(sd); + + if (code->index >= (ARRAY_SIZE(imx214_mbus_formats) / 4)) return -EINVAL; - code->code = IMX214_MBUS_CODE; + code->code = imx214_get_format_code(imx214); return 0; } @@ -550,7 +580,11 @@ static int imx214_enum_frame_size(struct v4l2_subdev *subdev, struct v4l2_subdev_state *sd_state, struct v4l2_subdev_frame_size_enum *fse) { - if (fse->code != IMX214_MBUS_CODE) + struct imx214 *imx214 = to_imx214(subdev); + u32 code; + + code = imx214_get_format_code(imx214); + if (fse->code != code) return -EINVAL; if (fse->index >= ARRAY_SIZE(imx214_modes)) @@ -713,6 +747,7 @@ static int imx214_entity_init_state(struct v4l2_subdev *subdev, struct v4l2_subdev_format fmt = { }; fmt.which = sd_state ? V4L2_SUBDEV_FORMAT_TRY : V4L2_SUBDEV_FORMAT_ACTIVE; + fmt.format.code = MEDIA_BUS_FMT_SRGGB10_1X10; fmt.format.width = imx214_modes[0].width; fmt.format.height = imx214_modes[0].height; @@ -755,6 +790,11 @@ static int imx214_set_ctrl(struct v4l2_ctrl *ctrl) case V4L2_CID_EXPOSURE: cci_write(imx214->regmap, IMX214_REG_EXPOSURE, ctrl->val, &ret); break; + case V4L2_CID_HFLIP: + case V4L2_CID_VFLIP: + cci_write(imx214->regmap, IMX214_REG_ORIENTATION, + imx214->hflip->val | imx214->vflip->val << 1, &ret); + break; case V4L2_CID_VBLANK: cci_write(imx214->regmap, IMX214_REG_FRM_LENGTH_LINES, format->height + ctrl->val, &ret); @@ -793,7 +833,7 @@ static int imx214_ctrls_init(struct imx214 *imx214) return ret; ctrl_hdlr = &imx214->ctrls; - ret = v4l2_ctrl_handler_init(&imx214->ctrls, 8); + ret = v4l2_ctrl_handler_init(&imx214->ctrls, 10); if (ret) return ret; @@ -830,6 +870,18 @@ static int imx214_ctrls_init(struct imx214 *imx214) IMX214_EXPOSURE_STEP, exposure_def); + imx214->hflip = v4l2_ctrl_new_std(ctrl_hdlr, &imx214_ctrl_ops, + V4L2_CID_HFLIP, 0, 1, 1, 0); + if (imx214->hflip) + imx214->hflip->flags |= V4L2_CTRL_FLAG_MODIFY_LAYOUT; + + imx214->vflip = v4l2_ctrl_new_std(ctrl_hdlr, &imx214_ctrl_ops, + V4L2_CID_VFLIP, 0, 1, 1, 0); + if (imx214->vflip) + imx214->vflip->flags |= V4L2_CTRL_FLAG_MODIFY_LAYOUT; + + v4l2_ctrl_cluster(2, &imx214->hflip); + imx214->unit_size = v4l2_ctrl_new_std_compound(ctrl_hdlr, NULL, V4L2_CID_UNIT_CELL_SIZE, @@ -1023,6 +1075,7 @@ static int imx214_enum_frame_interval(struct v4l2_subdev *subdev, struct v4l2_subdev_state *sd_state, struct v4l2_subdev_frame_interval_enum *fie) { + struct imx214 *imx214 = to_imx214(subdev); const struct imx214_mode *mode; if (fie->index != 0) @@ -1032,7 +1085,7 @@ static int imx214_enum_frame_interval(struct v4l2_subdev *subdev, ARRAY_SIZE(imx214_modes), width, height, fie->width, fie->height); - fie->code = IMX214_MBUS_CODE; + fie->code = imx214_get_format_code(imx214); fie->width = mode->width; fie->height = mode->height; fie->interval.numerator = 1;