Hi Sakari,
Thank you for the patch.
On Wed, Mar 13, 2024 at 09:25:05AM +0200, Sakari Ailus wrote:
> Calculate binning configuration from sub-device state so the state related
> configuration can be removed from the driver's device context struct.
>
> Signed-off-by: Sakari Ailus <sakari.ailus@xxxxxxxxxxxxxxx>
> ---
> drivers/media/i2c/ccs/ccs-core.c | 72 ++++++++++++++++++++++----------
> drivers/media/i2c/ccs/ccs.h | 3 --
> 2 files changed, 49 insertions(+), 26 deletions(-)
>
> diff --git a/drivers/media/i2c/ccs/ccs-core.c b/drivers/media/i2c/ccs/ccs-core.c
> index a8c48abd2e30..3b80c54453cc 100644
> --- a/drivers/media/i2c/ccs/ccs-core.c
> +++ b/drivers/media/i2c/ccs/ccs-core.c
> @@ -511,13 +511,52 @@ static int ccs_pll_try(struct ccs_sensor *sensor, struct ccs_pll *pll)
> return ccs_pll_calculate(&client->dev, &lim, pll);
> }
>
> +static void
> +ccs_get_binning(struct ccs_sensor *sensor, u8 *binning_mode, u8 *binh, u8 *binv)
> +{
> + struct v4l2_subdev_state *binner_state =
> + v4l2_subdev_get_locked_active_state(&sensor->binner->sd);
> + struct v4l2_rect *binner_sink_crop =
> + v4l2_subdev_state_get_crop(binner_state, CCS_PAD_SINK,
> + CCS_STREAM_PIXEL);
> + struct v4l2_rect *binner_sink_comp =
> + v4l2_subdev_state_get_compose(binner_state, CCS_PAD_SINK,
> + CCS_STREAM_PIXEL);
I like this patch very much :-) The comments I made to 28/28 apply there
too.
> +
> + if (binner_sink_crop->width == binner_sink_comp->width &&
> + binner_sink_crop->height == binner_sink_comp->height) {
> + if (binning_mode)
> + *binning_mode = 0;
> +
> + if (binh)
> + *binh = 1;
> +
> + if (binv)
> + *binv = 1;
> +
> + return;
> + }
> +
> + if (binning_mode)
> + *binning_mode = 1;
> +
> + if (binh)
> + *binh = binner_sink_crop->width / binner_sink_comp->width;
> +
> + if (binv)
> + *binv = binner_sink_crop->height / binner_sink_comp->height;
binh and binv are never NULL. How about the following ?
if (binning_mode)
*binning_mode = sink_crop->width != sink_comp->width ||
sink_crop->height != sink_comp->height;
*binh = sink_crop->width / sink_comp->width;
*binv = sink_crop->height / sink_comp->height;
> +}
> +
> static int ccs_pll_update(struct ccs_sensor *sensor)
> {
> struct ccs_pll *pll = &sensor->pll;
> + u8 binh, binv;
> int rval;
>
> - pll->binning_horizontal = sensor->binning_horizontal;
> - pll->binning_vertical = sensor->binning_vertical;
> + ccs_get_binning(sensor, NULL, &binh, &binv);
> +
> + pll->binning_horizontal = binh;
> + pll->binning_vertical = binv;
> pll->link_freq =
> sensor->link_freq->qmenu_int[sensor->link_freq->val];
> pll->scale_m = sensor->scale_m;
> @@ -1241,8 +1280,11 @@ static void ccs_update_blanking(struct ccs_sensor *sensor,
> struct v4l2_ctrl *hblank = sensor->hblank;
> u16 min_fll, max_fll, min_llp, max_llp, min_lbp;
> int min, max;
> + u8 binh, binv;
> +
> + ccs_get_binning(sensor, NULL, &binh, &binv);
>
> - if (sensor->binning_vertical > 1 || sensor->binning_horizontal > 1) {
> + if (binv > 1 || binh > 1) {
> min_fll = CCS_LIM(sensor, MIN_FRAME_LENGTH_LINES_BIN);
> max_fll = CCS_LIM(sensor, MAX_FRAME_LENGTH_LINES_BIN);
> min_llp = CCS_LIM(sensor, MIN_LINE_LENGTH_PCK_BIN);
> @@ -1813,7 +1855,7 @@ static int ccs_enable_streams(struct v4l2_subdev *subdev,
> v4l2_subdev_state_get_crop(src_state, CCS_PAD_SRC,
> CCS_STREAM_PIXEL);
> struct i2c_client *client = v4l2_get_subdevdata(&sensor->src->sd);
> - unsigned int binning_mode;
> + u8 binning_mode, binh, binv;
> int rval;
>
> if (pad != CCS_PAD_SRC)
> @@ -1835,19 +1877,12 @@ static int ccs_enable_streams(struct v4l2_subdev *subdev,
> goto err_pm_put;
>
> /* Binning configuration */
> - if (sensor->binning_horizontal == 1 &&
> - sensor->binning_vertical == 1) {
> - binning_mode = 0;
> - } else {
> - u8 binning_type =
> - (sensor->binning_horizontal << 4)
> - | sensor->binning_vertical;
> + ccs_get_binning(sensor, &binning_mode, &binh, &binv);
>
> - rval = ccs_write(sensor, BINNING_TYPE, binning_type);
> + if (binning_mode) {
> + rval = ccs_write(sensor, BINNING_TYPE, (binh << 4) | binv);
> if (rval < 0)
> goto err_pm_put;
> -
> - binning_mode = 1;
> }
> rval = ccs_write(sensor, BINNING_MODE, binning_mode);
> if (rval < 0)
> @@ -2253,9 +2288,6 @@ static void ccs_propagate(struct v4l2_subdev *subdev,
> sensor->scale_m = CCS_LIM(sensor, SCALER_N_MIN);
> sensor->scaling_mode =
> CCS_SCALING_MODE_NO_SCALING;
> - } else if (ssd == sensor->binner) {
> - sensor->binning_horizontal = 1;
> - sensor->binning_vertical = 1;
> }
> }
> fallthrough;
> @@ -2529,10 +2561,6 @@ static void ccs_set_compose_binner(struct v4l2_subdev *subdev,
> best = this;
> }
> }
> - if (sel->which == V4L2_SUBDEV_FORMAT_ACTIVE) {
> - sensor->binning_vertical = binv;
> - sensor->binning_horizontal = binh;
> - }
>
> sel->r.width = (sink_crop->width / binh) & ~1;
> sel->r.height = (sink_crop->height / binv) & ~1;
> @@ -3721,8 +3749,6 @@ static int ccs_probe(struct i2c_client *client)
> sensor->binning_subtypes[i].vertical);
> }
> }
> - sensor->binning_horizontal = 1;
> - sensor->binning_vertical = 1;
>
> if (device_create_file(&client->dev, &dev_attr_ident) != 0) {
> dev_err(&client->dev, "sysfs ident entry creation failed\n");
> diff --git a/drivers/media/i2c/ccs/ccs.h b/drivers/media/i2c/ccs/ccs.h
> index a2a461cda338..e6fc00a9fa11 100644
> --- a/drivers/media/i2c/ccs/ccs.h
> +++ b/drivers/media/i2c/ccs/ccs.h
> @@ -237,9 +237,6 @@ struct ccs_sensor {
> u32 embedded_mbus_code;
> u8 emb_data_ctrl;
>
> - u8 binning_horizontal;
> - u8 binning_vertical;
> -
> u8 scale_m;
> u8 scaling_mode;
>
--
Regards,
Laurent Pinchart
