kevin/linux
1
Fork 0
Code

media: max9286: Use frame interval from subdev state

Browse Source 
Use the frame interval stored in the subdev state instead of storing
a copy in the driver private structure.

Initialize the frame interval to the special case 0/0 that in the
max9286 driver represents automatic handling of frame sync.

As the frame sync mode is set at s_stream() time, we can remove it
from max9286_setup().

Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Link: https://lore.kernel.org/r/20240617161135.130719-12-jacopo.mondi@ideasonboard.com
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
This commit is contained in:
Jacopo Mondi 2024-06-17 18:11:34 +02:00 committed by Laurent Pinchart
parent 33fb59ca95
commit 65f3594366
1 changed files with 24 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
drivers/media/i2c/max9286.c
View File

@ -197,8 +197,6 @@ struct max9286_priv {
struct v4l2_ctrl *pixelrate_ctrl; struct v4l2_ctrl *pixelrate_ctrl;
unsigned int pixelrate; unsigned int pixelrate;
struct v4l2_fract interval;
unsigned int nsources; unsigned int nsources;
unsigned int source_mask; unsigned int source_mask;
unsigned int route_mask; unsigned int route_mask;
@ -571,11 +569,14 @@ static void max9286_set_video_format(struct max9286_priv *priv,
MAX9286_INVVS | MAX9286_HVSRC_D14); MAX9286_INVVS | MAX9286_HVSRC_D14);
} }
static void max9286_set_fsync_period(struct max9286_priv *priv) static void max9286_set_fsync_period(struct max9286_priv *priv,
struct v4l2_subdev_state *state)
{ {
const struct v4l2_fract *interval;
u32 fsync; u32 fsync;
if (!priv->interval.numerator || !priv->interval.denominator) { interval = v4l2_subdev_state_get_interval(state, MAX9286_SRC_PAD);
if (!interval->numerator || !interval->denominator) {
/* /*
* Special case, a null interval enables automatic FRAMESYNC * Special case, a null interval enables automatic FRAMESYNC
* mode. FRAMESYNC is taken from the slowest link. * mode. FRAMESYNC is taken from the slowest link.
@ -591,8 +592,8 @@ static void max9286_set_fsync_period(struct max9286_priv *priv)
* The FRAMESYNC generator is configured with a period expressed as a * The FRAMESYNC generator is configured with a period expressed as a
* number of PCLK periods. * number of PCLK periods.
*/ */
fsync = div_u64((u64)priv->pixelrate * priv->interval.numerator, fsync = div_u64((u64)priv->pixelrate * interval->numerator,
priv->interval.denominator); interval->denominator);
dev_dbg(&priv->client->dev, "fsync period %u (pclk %u)\n", fsync, dev_dbg(&priv->client->dev, "fsync period %u (pclk %u)\n", fsync,
priv->pixelrate); priv->pixelrate);
@ -801,7 +802,7 @@ static int max9286_s_stream(struct v4l2_subdev *sd, int enable)
format = v4l2_subdev_state_get_format(state, MAX9286_SRC_PAD); format = v4l2_subdev_state_get_format(state, MAX9286_SRC_PAD);
max9286_set_video_format(priv, format); max9286_set_video_format(priv, format);
max9286_set_fsync_period(priv); max9286_set_fsync_period(priv, state);
/* /*
* The frame sync between cameras is transmitted across the * The frame sync between cameras is transmitted across the
@ -874,19 +875,11 @@ static int max9286_get_frame_interval(struct v4l2_subdev *sd,
struct v4l2_subdev_state *sd_state, struct v4l2_subdev_state *sd_state,
struct v4l2_subdev_frame_interval *interval) struct v4l2_subdev_frame_interval *interval)
{ {
struct max9286_priv *priv = sd_to_max9286(sd);
/*
* FIXME: Implement support for V4L2_SUBDEV_FORMAT_TRY, using the V4L2
* subdev active state API.
*/
if (interval->which != V4L2_SUBDEV_FORMAT_ACTIVE)
return -EINVAL;
if (interval->pad != MAX9286_SRC_PAD) if (interval->pad != MAX9286_SRC_PAD)
return -EINVAL; return -EINVAL;
interval->interval = priv->interval; interval->interval = *v4l2_subdev_state_get_interval(sd_state,
interval->pad);
return 0; return 0;
} }
@ -895,19 +888,11 @@ static int max9286_set_frame_interval(struct v4l2_subdev *sd,
struct v4l2_subdev_state *sd_state, struct v4l2_subdev_state *sd_state,
struct v4l2_subdev_frame_interval *interval) struct v4l2_subdev_frame_interval *interval)
{ {
struct max9286_priv *priv = sd_to_max9286(sd);
/*
* FIXME: Implement support for V4L2_SUBDEV_FORMAT_TRY, using the V4L2
* subdev active state API.
*/
if (interval->which != V4L2_SUBDEV_FORMAT_ACTIVE)
return -EINVAL;
if (interval->pad != MAX9286_SRC_PAD) if (interval->pad != MAX9286_SRC_PAD)
return -EINVAL; return -EINVAL;
priv->interval = interval->interval; *v4l2_subdev_state_get_interval(sd_state,
interval->pad) = interval->interval;
return 0; return 0;
} }
@ -994,9 +979,21 @@ static const struct v4l2_mbus_framefmt max9286_default_format = {
static int max9286_init_state(struct v4l2_subdev *sd, static int max9286_init_state(struct v4l2_subdev *sd,
struct v4l2_subdev_state *state) struct v4l2_subdev_state *state)
{ {
struct v4l2_fract *interval;
for (unsigned int i = 0; i < MAX9286_N_PADS; i++) for (unsigned int i = 0; i < MAX9286_N_PADS; i++)
*v4l2_subdev_state_get_format(state, i) = max9286_default_format; *v4l2_subdev_state_get_format(state, i) = max9286_default_format;
/*
* Special case: a null interval enables automatic FRAMESYNC mode.
*
* FRAMESYNC is taken from the slowest link. See register 0x01
* configuration.
*/
interval = v4l2_subdev_state_get_interval(state, MAX9286_SRC_PAD);
interval->numerator = 0;
interval->denominator = 0;
return 0; return 0;
} }
@ -1143,7 +1140,6 @@ static int max9286_setup(struct max9286_priv *priv)
max9286_write(priv, 0x69, (0xf & ~priv->route_mask)); max9286_write(priv, 0x69, (0xf & ~priv->route_mask));
max9286_set_video_format(priv, &max9286_default_format); max9286_set_video_format(priv, &max9286_default_format);
max9286_set_fsync_period(priv);
cfg = max9286_read(priv, 0x1c); cfg = max9286_read(priv, 0x1c);
if (cfg < 0) if (cfg < 0)