Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Camera fixups for 6.6 #5613

Merged
merged 6 commits into from
Sep 25, 2023
Merged

Camera fixups for 6.6 #5613

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9fa1e58
media: bcm2835-unicam: Fix up async notifier usage
6by9 Sep 22, 2023
5d2cbe4
media: i2c: imx219: make HBLANK r/w to allow longer exposures
6by9 Sep 14, 2023
d86e6b2
media: imx219: Advertise embedded data node on media pad 1
naushir Mar 10, 2023
fe7adbf
media: i2c: imx219: Scale the pixel clock rate for the 640x480 mode
naushir Feb 8, 2022
90eea84
media: i2c: imx219: fix binning and rate_factor for 480p and 1232p
vvarma Sep 22, 2023
79fa290
fixup video-mux
6by9 Sep 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
158 changes: 104 additions & 54 deletions drivers/media/i2c/imx219.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,16 @@
#define IMX219_PIXEL_ARRAY_WIDTH 3280U
#define IMX219_PIXEL_ARRAY_HEIGHT 2464U

/* Embedded metadata stream structure */
#define IMX219_EMBEDDED_LINE_WIDTH 16384
#define IMX219_NUM_EMBEDDED_LINES 1

enum pad_types {
IMAGE_PAD,
METADATA_PAD,
NUM_PADS
};

struct imx219_reg {
u16 address;
u8 val;
Expand Down Expand Up @@ -458,7 +468,7 @@ static const struct imx219_mode supported_modes[] = {

struct imx219 {
struct v4l2_subdev sd;
struct media_pad pad;
struct media_pad pad[NUM_PADS];

struct clk *xclk; /* system clock to IMX219 */
u32 xclk_freq;
Expand Down Expand Up @@ -708,6 +718,13 @@ static int imx219_init_cfg(struct v4l2_subdev *sd,
crop->width = IMX219_PIXEL_ARRAY_WIDTH;
crop->height = IMX219_PIXEL_ARRAY_HEIGHT;

/* Initialize try_fmt for the embedded metadata pad */
format = v4l2_subdev_get_pad_format(sd, state, 1);
format->code = MEDIA_BUS_FMT_SENSOR_DATA;
format->width = IMX219_EMBEDDED_LINE_WIDTH;
format->height = IMX219_NUM_EMBEDDED_LINES;
format->field = V4L2_FIELD_NONE;

return 0;
}

Expand All @@ -717,10 +734,20 @@ static int imx219_enum_mbus_code(struct v4l2_subdev *sd,
{
struct imx219 *imx219 = to_imx219(sd);

if (code->index >= (ARRAY_SIZE(imx219_mbus_formats) / 4))
if (code->pad >= NUM_PADS)
return -EINVAL;

code->code = imx219_get_format_code(imx219, imx219_mbus_formats[code->index * 4]);
if (code->pad == IMAGE_PAD) {
if (code->index >= (ARRAY_SIZE(imx219_mbus_formats) / 4))
return -EINVAL;

code->code = imx219_get_format_code(imx219, imx219_mbus_formats[code->index * 4]);
} else {
if (code->index > 0)
return -EINVAL;

code->code = MEDIA_BUS_FMT_SENSOR_DATA;
}

return 0;
}
Expand All @@ -732,17 +759,30 @@ static int imx219_enum_frame_size(struct v4l2_subdev *sd,
struct imx219 *imx219 = to_imx219(sd);
u32 code;

if (fse->index >= ARRAY_SIZE(supported_modes))
if (fse->pad >= NUM_PADS)
return -EINVAL;

code = imx219_get_format_code(imx219, fse->code);
if (fse->code != code)
return -EINVAL;
if (fse->pad == IMAGE_PAD) {
if (fse->index >= ARRAY_SIZE(supported_modes))
return -EINVAL;

code = imx219_get_format_code(imx219, fse->code);
if (fse->code != code)
return -EINVAL;

fse->min_width = supported_modes[fse->index].width;
fse->max_width = fse->min_width;
fse->min_height = supported_modes[fse->index].height;
fse->max_height = fse->min_height;
fse->min_width = supported_modes[fse->index].width;
fse->max_width = fse->min_width;
fse->min_height = supported_modes[fse->index].height;
fse->max_height = fse->min_height;
} else {
if (fse->code != MEDIA_BUS_FMT_SENSOR_DATA || fse->index > 0)
return -EINVAL;

fse->min_width = IMX219_EMBEDDED_LINE_WIDTH;
fse->max_width = fse->min_width;
fse->min_height = IMX219_NUM_EMBEDDED_LINES;
fse->max_height = fse->min_height;
}

return 0;
}
Expand All @@ -756,48 +796,57 @@ static int imx219_set_pad_format(struct v4l2_subdev *sd,
int exposure_max, exposure_def, hblank;
struct v4l2_mbus_framefmt *format;

mode = v4l2_find_nearest_size(supported_modes,
ARRAY_SIZE(supported_modes),
width, height,
fmt->format.width, fmt->format.height);

imx219_update_pad_format(imx219, mode, &fmt->format, fmt->format.code);
format = v4l2_subdev_get_pad_format(sd, sd_state, 0);

if (imx219->mode == mode && format->code == fmt->format.code)
return 0;

if (fmt->which == V4L2_SUBDEV_FORMAT_ACTIVE) {
u32 prev_hts = imx219->mode->width + imx219->hblank->val;
if (fmt->pad >= NUM_PADS)
pelwell marked this conversation as resolved.
Show resolved Hide resolved
return -EINVAL;

imx219->mode = mode;
/* Update limits and set FPS to default */
__v4l2_ctrl_modify_range(imx219->vblank, IMX219_VBLANK_MIN,
IMX219_VTS_MAX - mode->height, 1,
mode->vts_def - mode->height);
__v4l2_ctrl_s_ctrl(imx219->vblank,
mode->vts_def - mode->height);
/* Update max exposure while meeting expected vblanking */
exposure_max = mode->vts_def - 4;
exposure_def = (exposure_max < IMX219_EXPOSURE_DEFAULT) ?
exposure_max : IMX219_EXPOSURE_DEFAULT;
__v4l2_ctrl_modify_range(imx219->exposure,
imx219->exposure->minimum,
exposure_max, imx219->exposure->step,
exposure_def);
/*
* Retain PPL setting from previous mode so that the
* line time does not change on a mode change.
* Limits have to be recomputed as the controls define
* the blanking only, so PPL values need to have the
* mode width subtracted.
*/
hblank = prev_hts - mode->width;
__v4l2_ctrl_modify_range(imx219->hblank,
IMX219_PPL_MIN - mode->width,
IMX219_PPL_MAX - mode->width,
1, IMX219_PPL_MIN - mode->width);
__v4l2_ctrl_s_ctrl(imx219->hblank, hblank);
if (fmt->pad == IMAGE_PAD) {
mode = v4l2_find_nearest_size(supported_modes,
ARRAY_SIZE(supported_modes),
width, height,
fmt->format.width, fmt->format.height);

imx219_update_pad_format(imx219, mode, &fmt->format, fmt->format.code);
format = v4l2_subdev_get_pad_format(sd, sd_state, 0);

if (imx219->mode == mode && format->code == fmt->format.code)
return 0;

if (fmt->which == V4L2_SUBDEV_FORMAT_ACTIVE) {
u32 prev_hts = imx219->mode->width + imx219->hblank->val;

imx219->mode = mode;
/* Update limits and set FPS to default */
__v4l2_ctrl_modify_range(imx219->vblank, IMX219_VBLANK_MIN,
IMX219_VTS_MAX - mode->height, 1,
mode->vts_def - mode->height);
__v4l2_ctrl_s_ctrl(imx219->vblank,
mode->vts_def - mode->height);
/* Update max exposure while meeting expected vblanking */
exposure_max = mode->vts_def - 4;
exposure_def = (exposure_max < IMX219_EXPOSURE_DEFAULT) ?
exposure_max : IMX219_EXPOSURE_DEFAULT;
__v4l2_ctrl_modify_range(imx219->exposure,
imx219->exposure->minimum,
exposure_max, imx219->exposure->step,
exposure_def);
/*
* Retain PPL setting from previous mode so that the
* line time does not change on a mode change.
* Limits have to be recomputed as the controls define
* the blanking only, so PPL values need to have the
* mode width subtracted.
*/
hblank = prev_hts - mode->width;
__v4l2_ctrl_modify_range(imx219->hblank,
IMX219_PPL_MIN - mode->width,
IMX219_PPL_MAX - mode->width,
1, IMX219_PPL_MIN - mode->width);
__v4l2_ctrl_s_ctrl(imx219->hblank, hblank);
}
} else {
format = v4l2_subdev_get_pad_format(sd, sd_state, 1);
/* Don't allow the embedded data format to be changed */
fmt->format = *format;
}

*format = fmt->format;
Expand Down Expand Up @@ -1412,9 +1461,10 @@ static int imx219_probe(struct i2c_client *client)
imx219->sd.entity.function = MEDIA_ENT_F_CAM_SENSOR;

/* Initialize source pad */
imx219->pad.flags = MEDIA_PAD_FL_SOURCE;
imx219->pad[IMAGE_PAD].flags = MEDIA_PAD_FL_SOURCE;
imx219->pad[METADATA_PAD].flags = MEDIA_PAD_FL_SOURCE;

ret = media_entity_pads_init(&imx219->sd.entity, 1, &imx219->pad);
ret = media_entity_pads_init(&imx219->sd.entity, NUM_PADS, imx219->pad);
if (ret) {
dev_err(dev, "failed to init entity pads: %d\n", ret);
goto error_handler_free;
Expand Down