X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fluka.git;a=blobdiff_plain;f=target%2Flinux%2Fbcm27xx%2Fpatches-4.19%2F950-0221-staging-bcm2835-camera-Set-sequence-number-correctly.patch;fp=target%2Flinux%2Fbcm27xx%2Fpatches-4.19%2F950-0221-staging-bcm2835-camera-Set-sequence-number-correctly.patch;h=0000000000000000000000000000000000000000;hp=dbfa67cfe66042f0a48321397d4315117a2ab7d3;hb=745c447579326d26a239676173854065fae1a197;hpb=ad84c095028f6ddef95a92e028760cce23d32f6c

diff --git a/target/linux/bcm27xx/patches-4.19/950-0221-staging-bcm2835-camera-Set-sequence-number-correctly.patch b/target/linux/bcm27xx/patches-4.19/950-0221-staging-bcm2835-camera-Set-sequence-number-correctly.patch
deleted file mode 100644
index dbfa67cfe6..0000000000
--- a/target/linux/bcm27xx/patches-4.19/950-0221-staging-bcm2835-camera-Set-sequence-number-correctly.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From ba37d62e7bbdf42c2fa9ac3655354992da199a4b Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.org>
-Date: Thu, 21 Jun 2018 17:02:14 +0100
-Subject: [PATCH] staging: bcm2835-camera: Set sequence number
- correctly
-
-Set the sequence number in vb2_v4l2_buffer mainly so the
-latest v4l2-ctl reports the frame rate correctly.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
----
- drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c | 4 ++++
- drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h | 2 ++
- 2 files changed, 6 insertions(+)
-
---- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
-+++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
-@@ -409,6 +409,7 @@ static void buffer_cb(struct vchiq_mmal_
- 		}
- 	}
- 	dev->capture.last_timestamp = buf->vb.vb2_buf.timestamp;
-+	buf->vb.sequence = dev->capture.sequence++;
- 
- 	vb2_set_plane_payload(&buf->vb.vb2_buf, 0, length);
- 	if (mmal_flags & MMAL_BUFFER_HEADER_FLAG_KEYFRAME)
-@@ -537,6 +538,9 @@ static int start_streaming(struct vb2_qu
- 	/* enable frame capture */
- 	dev->capture.frame_count = 1;
- 
-+	/* reset sequence number */
-+	dev->capture.sequence = 0;
-+
- 	/* if the preview is not already running, wait for a few frames for AGC
- 	 * to settle down.
- 	 */
---- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h
-+++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h
-@@ -93,6 +93,8 @@ struct bm2835_mmal_dev {
- 		ktime_t kernel_start_ts;
- 		/* Timestamp of last frame */
- 		u64		last_timestamp;
-+		/* Sequence number of last buffer */
-+		u32		sequence;
- 
- 		struct vchiq_mmal_port  *port; /* port being used for capture */
- 		/* camera port being used for capture */