diff options
Diffstat (limited to 'target/linux/brcm2708/patches-4.14/950-0389-staging-bcm2835-camera-use-ktime_t-for-timestamps.patch')
| -rw-r--r-- | target/linux/brcm2708/patches-4.14/950-0389-staging-bcm2835-camera-use-ktime_t-for-timestamps.patch | 87 |
1 files changed, 87 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-4.14/950-0389-staging-bcm2835-camera-use-ktime_t-for-timestamps.patch b/target/linux/brcm2708/patches-4.14/950-0389-staging-bcm2835-camera-use-ktime_t-for-timestamps.patch new file mode 100644 index 0000000000..5801afea52 --- /dev/null +++ b/target/linux/brcm2708/patches-4.14/950-0389-staging-bcm2835-camera-use-ktime_t-for-timestamps.patch @@ -0,0 +1,87 @@ +From fab723d6ce6dd2052b4febd65ae62425288d79d3 Mon Sep 17 00:00:00 2001 +From: Arnd Bergmann <arnd@arndb.de> +Date: Mon, 27 Nov 2017 14:19:56 +0100 +Subject: [PATCH 389/454] staging: bcm2835-camera use ktime_t for timestamps + +commit 6cf83f2a9e81c500819938fad3555081471212c6 upstream with +minor mods + +struct timeval is deprecated for in-kernel use, and converting +this function to use ktime_t makes it simpler as well. + +Signed-off-by: Arnd Bergmann <arnd@arndb.de> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org> +--- + .../bcm2835-camera/bcm2835-camera.c | 37 +++++-------------- + .../bcm2835-camera/bcm2835-camera.h | 2 +- + 2 files changed, 10 insertions(+), 29 deletions(-) + +--- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c ++++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c +@@ -374,37 +374,18 @@ static void buffer_cb(struct vchiq_mmal_ + buf->vb.vb2_buf.timestamp); + + } else if(pts != 0) { +- struct timeval timestamp; ++ ktime_t timestamp; + s64 runtime_us = pts - + dev->capture.vc_start_timestamp; +- u32 div = 0; +- u32 rem = 0; +- +- div = +- div_u64_rem(runtime_us, USEC_PER_SEC, &rem); +- timestamp.tv_sec = +- dev->capture.kernel_start_ts.tv_sec + div; +- timestamp.tv_usec = +- dev->capture.kernel_start_ts.tv_usec + rem; +- +- if (timestamp.tv_usec >= +- USEC_PER_SEC) { +- timestamp.tv_sec++; +- timestamp.tv_usec -= +- USEC_PER_SEC; +- } ++ timestamp = ktime_add_us(dev->capture.kernel_start_ts, ++ runtime_us); + v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev, +- "Convert start time %d.%06d and %llu " +- "with offset %llu to %d.%06d\n", +- (int)dev->capture.kernel_start_ts. +- tv_sec, +- (int)dev->capture.kernel_start_ts. +- tv_usec, ++ "Convert start time %llu and %llu " ++ "with offset %llu to %llu\n", ++ ktime_to_ns(dev->capture.kernel_start_ts), + dev->capture.vc_start_timestamp, pts, +- (int)timestamp.tv_sec, +- (int)timestamp.tv_usec); +- buf->vb.vb2_buf.timestamp = timestamp.tv_sec * 1000000000ULL + +- timestamp.tv_usec * 1000ULL; ++ ktime_to_ns(timestamp)); ++ buf->vb.vb2_buf.timestamp = ktime_to_ns(timestamp); + } else { + if (dev->capture.last_timestamp) { + buf->vb.vb2_buf.timestamp = dev->capture.last_timestamp; +@@ -596,7 +577,7 @@ static int start_streaming(struct vb2_qu + + dev->capture.last_timestamp = 0; + +- v4l2_get_timestamp(&dev->capture.kernel_start_ts); ++ dev->capture.kernel_start_ts = ktime_get(); + + /* enable the camera port */ + dev->capture.port->cb_ctx = dev; +--- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h ++++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h +@@ -92,7 +92,7 @@ struct bm2835_mmal_dev { + /* VC start timestamp for streaming */ + s64 vc_start_timestamp; + /* Kernel start timestamp for streaming */ +- struct timeval kernel_start_ts; ++ ktime_t kernel_start_ts; + /* Timestamp of last frame */ + u64 last_timestamp; + |