AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-28 11:18:45 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

media: staging: atomisp: convert timestamps to ktime_t

Browse Source 
timespec overflows in 2038 on 32-bit architectures, and the
getnstimeofday() suffers from possible time jumps, so the
timestamps here are better done using ktime_get(), which has
neither of those problems.

In case of ov2680, we don't seem to use the timestamp at
all, so I just remove it.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
Arnd Bergmann 2017-11-27 10:21:41 -05:00 committed by Mauro Carvalho Chehab
parent ea90b17116
commit 456e7b1804
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/staging/media/atomisp/i2c/ov2680.h
View File

@ -174,7 +174,6 @@ struct ov2680_format {
struct mutex input_lock; struct mutex input_lock;
struct v4l2_ctrl_handler ctrl_handler; struct v4l2_ctrl_handler ctrl_handler;
struct camera_sensor_platform_data *platform_data; struct camera_sensor_platform_data *platform_data;
struct timespec timestamp_t_focus_abs;
int vt_pix_clk_freq_mhz; int vt_pix_clk_freq_mhz;
int fmt_idx; int fmt_idx;
int run_mode; int run_mode;

17
drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c
View File

@ -973,7 +973,7 @@ static int ov5693_t_focus_abs(struct v4l2_subdev *sd, s32 value)
if (ret == 0) { if (ret == 0) {
dev->number_of_steps = value - dev->focus; dev->number_of_steps = value - dev->focus;
dev->focus = value; dev->focus = value;
getnstimeofday(&(dev->timestamp_t_focus_abs)); dev->timestamp_t_focus_abs = ktime_get();
} else } else
dev_err(&client->dev, dev_err(&client->dev,
"%s: i2c failed. ret %d\n", __func__, ret); "%s: i2c failed. ret %d\n", __func__, ret);
@ -993,16 +993,13 @@ static int ov5693_q_focus_status(struct v4l2_subdev *sd, s32 *value)
{ {
u32 status = 0; u32 status = 0;
struct ov5693_device *dev = to_ov5693_sensor(sd); struct ov5693_device *dev = to_ov5693_sensor(sd);
struct timespec temptime; ktime_t temptime;
const struct timespec timedelay = { ktime_t timedelay = ns_to_ktime(min_t(u32,
0, abs(dev->number_of_steps) * DELAY_PER_STEP_NS,
min((u32)abs(dev->number_of_steps) * DELAY_PER_STEP_NS, DELAY_MAX_PER_STEP_NS));
(u32)DELAY_MAX_PER_STEP_NS),
};
getnstimeofday(&temptime); temptime = ktime_sub(ktime_get(), (dev->timestamp_t_focus_abs));
temptime = timespec_sub(temptime, (dev->timestamp_t_focus_abs)); if (ktime_compare(temptime, timedelay) <= 0) {
if (timespec_compare(&temptime, &timedelay) <= 0) {
status |= ATOMISP_FOCUS_STATUS_MOVING; status |= ATOMISP_FOCUS_STATUS_MOVING;
status |= ATOMISP_FOCUS_HP_IN_PROGRESS; status |= ATOMISP_FOCUS_HP_IN_PROGRESS;
} else { } else {

2
drivers/staging/media/atomisp/i2c/ov5693/ov5693.h
View File

@ -221,7 +221,7 @@ struct ov5693_device {
struct v4l2_ctrl_handler ctrl_handler; struct v4l2_ctrl_handler ctrl_handler;
struct camera_sensor_platform_data *platform_data; struct camera_sensor_platform_data *platform_data;
struct timespec timestamp_t_focus_abs; ktime_t timestamp_t_focus_abs;
int vt_pix_clk_freq_mhz; int vt_pix_clk_freq_mhz;
int fmt_idx; int fmt_idx;
int run_mode; int run_mode;