Commit e15170bd authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Phil Elwell
Browse files

staging: bcm2835-camera use ktime_t for timestamps 



commit 6cf83f2a 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: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarDave Stevenson <dave.stevenson@raspberrypi.org>
parent 93befc0e

drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c

+9 −28
Original line number Diff line number Diff line
@@ -374,37 +374,18 @@ static void buffer_cb(struct vchiq_mmal_instance *instance, 
				 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_queue *vq, unsigned int count) 


	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;

drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h

+1 −1
Original line number Diff line number Diff line
@@ -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;