mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 15:32:33 +00:00
f5919b65d4
Patch generation process: - rebase rpi/rpi-4.14.y on v4.14.89 from linux-stable - git format-patch v4.14.89 Patches skipped during rebase: - lan78xx: Read MAC address from DT if present - lan78xx: Enable LEDs and auto-negotiation - Revert "softirq: Let ksoftirqd do its job" - sc16is7xx: Fix for multi-channel stall - lan78xx: Ignore DT MAC address if already valid - lan78xx: Simple patch to prevent some crashes - tcp_write_queue_purge clears all the SKBs in the write queue - Revert "lan78xx: Simple patch to prevent some crashes" - lan78xx: Connect phy early - Arm: mm: ftrace: Only set text back to ro after kernel has been marked ro - Revert "Revert "softirq: Let ksoftirqd do its job"" - ASoC: cs4265: SOC_SINGLE register value error fix - Revert "ASoC: cs4265: SOC_SINGLE register value error fix" - Revert "net: pskb_trim_rcsum() and CHECKSUM_COMPLETE are friends" - Revert "Revert "net: pskb_trim_rcsum() and CHECKSUM_COMPLETE are friends"" Patches dropped after rebase: - net: Add non-mainline source for rtl8192cu wlan - net: Fix rtl8192cu build errors on other platforms - brcm: adds support for BCM43341 wifi - brcmfmac: Mute expected startup 'errors' - ARM64: Fix build break for RTL8187/RTL8192CU wifi - ARM64: Enable RTL8187/RTL8192CU wifi in build config - This is the driver for Sony CXD2880 DVB-T2/T tuner + demodulator - brcmfmac: add CLM download support - brcmfmac: request_firmware_direct is quieter - Sets the BCDC priority to constant 0 - brcmfmac: Disable ARP offloading when promiscuous - brcmfmac: Avoid possible out-of-bounds read - brcmfmac: Delete redundant length check - net: rtl8192cu: Normalize indentation - net: rtl8192cu: Fix implicit fallthrough warnings - Revert "Sets the BCDC priority to constant 0" - media: cxd2880: Bump to match 4.18.y version - media: cxd2880-spi: Bump to match 4.18.y version - Revert "mm: alloc_contig: re-allow CMA to compact FS pages" - Revert "Revert "mm: alloc_contig: re-allow CMA to compact FS pages"" - cxd2880: CXD2880_SPI_DRV should select DVB_CXD2880 with MEDIA_SUBDRV_AUTOSELECT - 950-0421-HID-hid-bigbenff-driver-for-BigBen-Interactive-PS3OF.patch - 950-0453-Add-hid-bigbenff-to-list-of-have_special_driver-for-.patch Make I2C built-in instead of modular as in upstream defconfig; also the easiest way to get MFD_ARIZONA enabled, which is required by kmod-sound-soc-rpi-cirrus. Add missing compatible strings from 4.9/960-add-rasbperrypi-compatible.patch, using upstream names for compute modules. Add extra patch to enable the LEDs on lan78xx. Compile-tested: bcm2708, bcm2709, bcm2710 (with CONFIG_ALL_KMODS=y) Runtime-tested: bcm2708, bcm2710 Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
94 lines
3.4 KiB
Diff
94 lines
3.4 KiB
Diff
From a740e59bf8099d1f5b5b29be3e9993fbd51e729a Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
|
Date: Fri, 6 Jul 2018 17:43:03 +0100
|
|
Subject: [PATCH 388/454] Revert "bcm2835-camera: Fix timestamp calculation
|
|
problem (#2214)"
|
|
|
|
This reverts commit 90ac037dbeecbb514b677e43b53bc5b1a452ea22.
|
|
This has been fixed in an alternate format upstream, so adopt that.
|
|
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
|
---
|
|
.../bcm2835-camera/bcm2835-camera.c | 41 ++++++++++++++-----
|
|
.../bcm2835-camera/bcm2835-camera.h | 2 +-
|
|
2 files changed, 32 insertions(+), 11 deletions(-)
|
|
|
|
--- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
|
|
+++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
|
|
@@ -374,17 +374,37 @@ static void buffer_cb(struct vchiq_mmal_
|
|
buf->vb.vb2_buf.timestamp);
|
|
|
|
} else if(pts != 0) {
|
|
+ struct timeval timestamp;
|
|
s64 runtime_us = pts -
|
|
dev->capture.vc_start_timestamp;
|
|
- buf->vb.vb2_buf.timestamp = (runtime_us * NSEC_PER_USEC) +
|
|
- dev->capture.kernel_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;
|
|
+ }
|
|
v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,
|
|
- "Buffer time set as converted timestamp - %llu "
|
|
- "= (pts [%lld usec] - vc start time [%llu usec]) "
|
|
- "+ kernel start time [%llu nsec]\n",
|
|
- buf->vb.vb2_buf.timestamp,
|
|
- pts, dev->capture.vc_start_timestamp,
|
|
- dev->capture.kernel_start_timestamp);
|
|
+ "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,
|
|
+ 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;
|
|
} else {
|
|
if (dev->capture.last_timestamp) {
|
|
buf->vb.vb2_buf.timestamp = dev->capture.last_timestamp;
|
|
@@ -394,7 +414,8 @@ static void buffer_cb(struct vchiq_mmal_
|
|
}
|
|
else {
|
|
buf->vb.vb2_buf.timestamp =
|
|
- dev->capture.kernel_start_timestamp;
|
|
+ dev->capture.kernel_start_ts.tv_sec * 1000000000ULL +
|
|
+ dev->capture.kernel_start_ts.tv_usec * 1000ULL;
|
|
v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,
|
|
"Buffer time set as start timestamp - %lld",
|
|
buf->vb.vb2_buf.timestamp);
|
|
@@ -575,7 +596,7 @@ static int start_streaming(struct vb2_qu
|
|
|
|
dev->capture.last_timestamp = 0;
|
|
|
|
- dev->capture.kernel_start_timestamp = ktime_get_ns();
|
|
+ v4l2_get_timestamp(&dev->capture.kernel_start_ts);
|
|
|
|
/* 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 */
|
|
- u64 kernel_start_timestamp;
|
|
+ struct timeval kernel_start_ts;
|
|
/* Timestamp of last frame */
|
|
u64 last_timestamp;
|
|
|