korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2025-01-06 05:44:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

media: i2c: thp7312: Store frame interval in subdev state

Browse Source 
Use the newly added storage for frame interval in the subdev state to
simplify the driver.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
This commit is contained in:
Laurent Pinchart 2023-12-13 17:00:10 +02:00 committed by Hans Verkuil
parent 95e802a2bf
commit a3e28ea777
1 changed files with 81 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

158
drivers/media/i2c/thp7312.c
View File

@ -266,9 +266,6 @@ struct thp7312_device {
struct v4l2_ctrl_handler ctrl_handler; struct v4l2_ctrl_handler ctrl_handler;
bool ctrls_applied; bool ctrls_applied;
/* These are protected by v4l2 active state */
const struct thp7312_mode_info *current_mode;
const struct thp7312_frame_rate *current_rate;
s64 link_freq; s64 link_freq;
struct { struct {
@ -310,6 +307,47 @@ static inline struct thp7312_device *to_thp7312_dev(struct v4l2_subdev *sd)
return container_of(sd, struct thp7312_device, sd); return container_of(sd, struct thp7312_device, sd);
} }
static const struct thp7312_mode_info *
thp7312_find_mode(unsigned int width, unsigned int height, bool nearest)
{
const struct thp7312_mode_info *mode;
mode = v4l2_find_nearest_size(thp7312_mode_info_data,
ARRAY_SIZE(thp7312_mode_info_data),
width, height, width, height);
if (!nearest && (mode->width != width || mode->height != height))
return NULL;
return mode;
}
static const struct thp7312_frame_rate *
thp7312_find_rate(const struct thp7312_mode_info *mode, unsigned int fps,
bool nearest)
{
const struct thp7312_frame_rate *best_rate = NULL;
const struct thp7312_frame_rate *rate;
unsigned int best_delta = UINT_MAX;
if (!mode)
return NULL;
for (rate = mode->rates; rate->fps && best_delta; ++rate) {
unsigned int delta = abs(rate->fps - fps);
if (delta <= best_delta) {
best_delta = delta;
best_rate = rate;
}
}
if (!nearest && best_delta)
return NULL;
return best_rate;
}
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
* Device Access & Configuration * Device Access & Configuration
*/ */
@ -442,17 +480,30 @@ static int thp7312_set_framefmt(struct thp7312_device *thp7312,
static int thp7312_init_mode(struct thp7312_device *thp7312, static int thp7312_init_mode(struct thp7312_device *thp7312,
struct v4l2_subdev_state *sd_state) struct v4l2_subdev_state *sd_state)
{ {
const struct thp7312_mode_info *mode;
const struct thp7312_frame_rate *rate;
struct v4l2_mbus_framefmt *fmt; struct v4l2_mbus_framefmt *fmt;
struct v4l2_fract *interval;
int ret; int ret;
/*
* TODO: The mode and rate should be cached in the subdev state, once
* support for extending states will be available.
*/
fmt = v4l2_subdev_state_get_format(sd_state, 0); fmt = v4l2_subdev_state_get_format(sd_state, 0);
interval = v4l2_subdev_state_get_interval(sd_state, 0);
mode = thp7312_find_mode(fmt->width, fmt->height, false);
rate = thp7312_find_rate(mode, interval->denominator, false);
if (WARN_ON(!mode || !rate))
return -EINVAL;
ret = thp7312_set_framefmt(thp7312, fmt); ret = thp7312_set_framefmt(thp7312, fmt);
if (ret) if (ret)
return ret; return ret;
return thp7312_change_mode(thp7312, thp7312->current_mode, return thp7312_change_mode(thp7312, mode, rate);
thp7312->current_rate);
} }
static int thp7312_stream_enable(struct thp7312_device *thp7312, bool enable) static int thp7312_stream_enable(struct thp7312_device *thp7312, bool enable)
@ -621,28 +672,6 @@ static bool thp7312_find_bus_code(u32 code)
return false; return false;
} }
static const struct thp7312_mode_info *
thp7312_find_mode(unsigned int width, unsigned int height, bool nearest)
{
const struct thp7312_mode_info *mode;
mode = v4l2_find_nearest_size(thp7312_mode_info_data,
ARRAY_SIZE(thp7312_mode_info_data),
width, height, width, height);
if (!nearest && (mode->width != width || mode->height != height))
return NULL;
return mode;
}
static void thp7312_set_frame_rate(struct thp7312_device *thp7312,
const struct thp7312_frame_rate *rate)
{
thp7312->link_freq = rate->link_freq;
thp7312->current_rate = rate;
}
static int thp7312_enum_mbus_code(struct v4l2_subdev *sd, static int thp7312_enum_mbus_code(struct v4l2_subdev *sd,
struct v4l2_subdev_state *sd_state, struct v4l2_subdev_state *sd_state,
struct v4l2_subdev_mbus_code_enum *code) struct v4l2_subdev_mbus_code_enum *code)
@ -707,6 +736,7 @@ static int thp7312_set_fmt(struct v4l2_subdev *sd,
struct thp7312_device *thp7312 = to_thp7312_dev(sd); struct thp7312_device *thp7312 = to_thp7312_dev(sd);
struct v4l2_mbus_framefmt *mbus_fmt = &format->format; struct v4l2_mbus_framefmt *mbus_fmt = &format->format;
struct v4l2_mbus_framefmt *fmt; struct v4l2_mbus_framefmt *fmt;
struct v4l2_fract *interval;
const struct thp7312_mode_info *mode; const struct thp7312_mode_info *mode;
if (!thp7312_find_bus_code(mbus_fmt->code)) if (!thp7312_find_bus_code(mbus_fmt->code))
@ -726,29 +756,12 @@ static int thp7312_set_fmt(struct v4l2_subdev *sd,
*mbus_fmt = *fmt; *mbus_fmt = *fmt;
if (format->which == V4L2_SUBDEV_FORMAT_ACTIVE) { interval = v4l2_subdev_state_get_interval(sd_state, 0);
thp7312->current_mode = mode; interval->numerator = 1;
thp7312_set_frame_rate(thp7312, &mode->rates[0]); interval->denominator = mode->rates[0].fps;
}
return 0; if (format->which == V4L2_SUBDEV_FORMAT_ACTIVE)
} thp7312->link_freq = mode->rates[0].link_freq;
static int thp7312_get_frame_interval(struct v4l2_subdev *sd,
struct v4l2_subdev_state *sd_state,
struct v4l2_subdev_frame_interval *fi)
{
struct thp7312_device *thp7312 = to_thp7312_dev(sd);
/*
* FIXME: Implement support for V4L2_SUBDEV_FORMAT_TRY, using the V4L2
* subdev active state API.
*/
if (fi->which != V4L2_SUBDEV_FORMAT_ACTIVE)
return -EINVAL;
fi->interval.numerator = 1;
fi->interval.denominator = thp7312->current_rate->fps;
return 0; return 0;
} }
@ -759,38 +772,28 @@ static int thp7312_set_frame_interval(struct v4l2_subdev *sd,
{ {
struct thp7312_device *thp7312 = to_thp7312_dev(sd); struct thp7312_device *thp7312 = to_thp7312_dev(sd);
const struct thp7312_mode_info *mode; const struct thp7312_mode_info *mode;
const struct thp7312_frame_rate *best_rate = NULL;
const struct thp7312_frame_rate *rate; const struct thp7312_frame_rate *rate;
unsigned int best_delta = UINT_MAX; const struct v4l2_mbus_framefmt *fmt;
struct v4l2_fract *interval;
unsigned int fps; unsigned int fps;
/*
* FIXME: Implement support for V4L2_SUBDEV_FORMAT_TRY, using the V4L2
* subdev active state API.
*/
if (fi->which != V4L2_SUBDEV_FORMAT_ACTIVE)
return -EINVAL;
/* Avoid divisions by 0, pick the highest frame if the interval is 0. */ /* Avoid divisions by 0, pick the highest frame if the interval is 0. */
fps = fi->interval.numerator fps = fi->interval.numerator
? DIV_ROUND_CLOSEST(fi->interval.denominator, fi->interval.numerator) ? DIV_ROUND_CLOSEST(fi->interval.denominator, fi->interval.numerator)
: UINT_MAX; : UINT_MAX;
mode = thp7312->current_mode; fmt = v4l2_subdev_state_get_format(sd_state, 0);
mode = thp7312_find_mode(fmt->width, fmt->height, false);
rate = thp7312_find_rate(mode, fps, true);
for (rate = mode->rates; rate->fps && best_delta; ++rate) { interval = v4l2_subdev_state_get_interval(sd_state, 0);
unsigned int delta = abs(rate->fps - fps); interval->numerator = 1;
interval->denominator = rate->fps;
if (delta <= best_delta) { if (fi->which == V4L2_SUBDEV_FORMAT_ACTIVE)
best_delta = delta; thp7312->link_freq = rate->link_freq;
best_rate = rate;
}
}
thp7312_set_frame_rate(thp7312, best_rate); fi->interval = *interval;
fi->interval.numerator = 1;
fi->interval.denominator = best_rate->fps;
return 0; return 0;
} }
@ -850,8 +853,10 @@ static int thp7312_init_state(struct v4l2_subdev *sd,
{ {
const struct thp7312_mode_info *default_mode = &thp7312_mode_info_data[0]; const struct thp7312_mode_info *default_mode = &thp7312_mode_info_data[0];
struct v4l2_mbus_framefmt *fmt; struct v4l2_mbus_framefmt *fmt;
struct v4l2_fract *interval;
fmt = v4l2_subdev_state_get_format(sd_state, 0); fmt = v4l2_subdev_state_get_format(sd_state, 0);
interval = v4l2_subdev_state_get_interval(sd_state, 0);
/* /*
* default init sequence initialize thp7312 to * default init sequence initialize thp7312 to
@ -866,6 +871,9 @@ static int thp7312_init_state(struct v4l2_subdev *sd,
fmt->height = default_mode->height; fmt->height = default_mode->height;
fmt->field = V4L2_FIELD_NONE; fmt->field = V4L2_FIELD_NONE;
interval->numerator = 1;
interval->denominator = default_mode->rates[0].fps;
return 0; return 0;
} }
@ -883,7 +891,7 @@ static const struct v4l2_subdev_pad_ops thp7312_pad_ops = {
.enum_mbus_code = thp7312_enum_mbus_code, .enum_mbus_code = thp7312_enum_mbus_code,
.get_fmt = v4l2_subdev_get_fmt, .get_fmt = v4l2_subdev_get_fmt,
.set_fmt = thp7312_set_fmt, .set_fmt = thp7312_set_fmt,
.get_frame_interval = thp7312_get_frame_interval, .get_frame_interval = v4l2_subdev_get_frame_interval,
.set_frame_interval = thp7312_set_frame_interval, .set_frame_interval = thp7312_set_frame_interval,
.enum_frame_size = thp7312_enum_frame_size, .enum_frame_size = thp7312_enum_frame_size,
.enum_frame_interval = thp7312_enum_frame_interval, .enum_frame_interval = thp7312_enum_frame_interval,
@ -1311,6 +1319,8 @@ static int thp7312_init_controls(struct thp7312_device *thp7312)
V4L2_CID_POWER_LINE_FREQUENCY_60HZ, 0, V4L2_CID_POWER_LINE_FREQUENCY_60HZ, 0,
V4L2_CID_POWER_LINE_FREQUENCY_50HZ); V4L2_CID_POWER_LINE_FREQUENCY_50HZ);
thp7312->link_freq = thp7312_mode_info_data[0].rates[0].link_freq;
link_freq = v4l2_ctrl_new_int_menu(hdl, &thp7312_ctrl_ops, link_freq = v4l2_ctrl_new_int_menu(hdl, &thp7312_ctrl_ops,
V4L2_CID_LINK_FREQ, 0, 0, V4L2_CID_LINK_FREQ, 0, 0,
&thp7312->link_freq); &thp7312->link_freq);
@ -2080,7 +2090,6 @@ static int thp7312_parse_dt(struct thp7312_device *thp7312)
static int thp7312_probe(struct i2c_client *client) static int thp7312_probe(struct i2c_client *client)
{ {
struct device *dev = &client->dev; struct device *dev = &client->dev;
struct v4l2_subdev_state *sd_state;
struct thp7312_device *thp7312; struct thp7312_device *thp7312;
int ret; int ret;
@ -2156,11 +2165,6 @@ static int thp7312_probe(struct i2c_client *client)
goto err_free_ctrls; goto err_free_ctrls;
} }
sd_state = v4l2_subdev_lock_and_get_active_state(&thp7312->sd);
thp7312->current_mode = &thp7312_mode_info_data[0];
thp7312_set_frame_rate(thp7312, &thp7312->current_mode->rates[0]);
v4l2_subdev_unlock_state(sd_state);
/* /*
* Enable runtime PM with autosuspend. As the device has been powered * Enable runtime PM with autosuspend. As the device has been powered
* manually, mark it as active, and increase the usage count without * manually, mark it as active, and increase the usage count without