aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm2708/patches-4.14/950-0393-staging-bcm2835-camera-Return-early-on-errors.patch
diff options
context:
space:
mode:
authorStijn Tintel <stijn@linux-ipv6.be>2018-11-10 13:03:18 +0200
committerStijn Tintel <stijn@linux-ipv6.be>2018-12-18 23:19:21 +0200
commitf5919b65d4c671fd5083838c7a445f319f9a13c8 (patch)
tree2c791d2a5dea5bbbb0b85f86f74afce2647c0726 /target/linux/brcm2708/patches-4.14/950-0393-staging-bcm2835-camera-Return-early-on-errors.patch
parent822b4c3b250a254e74407056ccfd5c6aa38da162 (diff)
downloadupstream-f5919b65d4c671fd5083838c7a445f319f9a13c8.tar.gz
upstream-f5919b65d4c671fd5083838c7a445f319f9a13c8.tar.bz2
upstream-f5919b65d4c671fd5083838c7a445f319f9a13c8.zip
brcm2708: add kernel 4.14 support
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>
Diffstat (limited to 'target/linux/brcm2708/patches-4.14/950-0393-staging-bcm2835-camera-Return-early-on-errors.patch')
-rw-r--r--target/linux/brcm2708/patches-4.14/950-0393-staging-bcm2835-camera-Return-early-on-errors.patch192
1 files changed, 192 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-4.14/950-0393-staging-bcm2835-camera-Return-early-on-errors.patch b/target/linux/brcm2708/patches-4.14/950-0393-staging-bcm2835-camera-Return-early-on-errors.patch
new file mode 100644
index 0000000000..6ea4638996
--- /dev/null
+++ b/target/linux/brcm2708/patches-4.14/950-0393-staging-bcm2835-camera-Return-early-on-errors.patch
@@ -0,0 +1,192 @@
+From d4154a99430bf73bc501bafc26de80cb1498626c Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.org>
+Date: Fri, 10 Mar 2017 17:27:56 +0000
+Subject: [PATCH 393/454] staging: bcm2835-camera: Return early on errors
+
+Fix several instances where it is easier to return
+early on error conditions than handle it as an else
+clause.
+As requested by Mauro.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
+---
+ .../bcm2835-camera/bcm2835-camera.c | 132 +++++++++---------
+ 1 file changed, 68 insertions(+), 64 deletions(-)
+
+--- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
++++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
+@@ -342,7 +342,9 @@ static void buffer_cb(struct vchiq_mmal_
+ vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
+ }
+ return;
+- } else if (length == 0) {
++ }
++
++ if (length == 0) {
+ /* stream ended */
+ if (buf) {
+ /* this should only ever happen if the port is
+@@ -365,70 +367,72 @@ static void buffer_cb(struct vchiq_mmal_
+ /* signal frame completion */
+ complete(&dev->capture.frame_cmplt);
+ }
+- } else {
+- if (dev->capture.frame_count) {
+- if (dev->capture.vc_start_timestamp == -1) {
+- buf->vb.vb2_buf.timestamp = ktime_get_ns();
+- v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,
+- "Buffer time set as current time - %lld",
+- buf->vb.vb2_buf.timestamp);
+-
+- } else if(pts != 0) {
+- ktime_t timestamp;
+- s64 runtime_us = pts -
+- dev->capture.vc_start_timestamp;
+- timestamp = ktime_add_us(dev->capture.kernel_start_ts,
+- runtime_us);
+- v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,
+- "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,
+- 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;
+- v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,
+- "Buffer time set as last timestamp - %lld",
+- buf->vb.vb2_buf.timestamp);
+- }
+- else {
+- buf->vb.vb2_buf.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);
+- }
+- }
+- dev->capture.last_timestamp = buf->vb.vb2_buf.timestamp;
++ return;
++ }
+
+- vb2_set_plane_payload(&buf->vb.vb2_buf, 0, length);
+- if (mmal_flags & MMAL_BUFFER_HEADER_FLAG_KEYFRAME)
+- buf->vb.flags |= V4L2_BUF_FLAG_KEYFRAME;
++ if (!dev->capture.frame_count) {
++ /* signal frame completion */
++ vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
++ complete(&dev->capture.frame_cmplt);
++ return;
++ }
+
++ if (dev->capture.vc_start_timestamp == -1) {
++ /*
++ * VPU doesn't support MMAL_PARAMETER_SYSTEM_TIME, rely on
++ * kernel time, and have no latency compensation.
++ */
++ buf->vb.vb2_buf.timestamp = ktime_get_ns();
++ v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,
++ "Buffer time set as current time - %lld",
++ buf->vb.vb2_buf.timestamp);
++ } else if (pts != 0) {
++ ktime_t timestamp;
++ s64 runtime_us = pts -
++ dev->capture.vc_start_timestamp;
++ timestamp = ktime_add_us(dev->capture.kernel_start_ts,
++ runtime_us);
++ v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,
++ "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,
++ 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;
+ v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,
+- "Buffer has ts %llu",
+- dev->capture.last_timestamp);
+- vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
+-
+- if (mmal_flags & MMAL_BUFFER_HEADER_FLAG_EOS &&
+- is_capturing(dev)) {
+- v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,
+- "Grab another frame as buffer has EOS");
+- vchiq_mmal_port_parameter_set(
+- instance,
+- dev->capture.camera_port,
+- MMAL_PARAMETER_CAPTURE,
+- &dev->capture.frame_count,
+- sizeof(dev->capture.frame_count));
+- }
++ "Buffer time set as last timestamp - %lld",
++ buf->vb.vb2_buf.timestamp);
+ } else {
+- /* signal frame completion */
+- vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
+- complete(&dev->capture.frame_cmplt);
++ buf->vb.vb2_buf.timestamp =
++ ktime_to_ns(dev->capture.kernel_start_ts);
++ v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,
++ "Buffer time set as start timestamp - %lld",
++ buf->vb.vb2_buf.timestamp);
+ }
+ }
++ dev->capture.last_timestamp = buf->vb.vb2_buf.timestamp;
++
++ vb2_set_plane_payload(&buf->vb.vb2_buf, 0, length);
++ if (mmal_flags & MMAL_BUFFER_HEADER_FLAG_KEYFRAME)
++ buf->vb.flags |= V4L2_BUF_FLAG_KEYFRAME;
++
++ v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,
++ "Buffer has ts %llu",
++ dev->capture.last_timestamp);
++ vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
++
++ if (mmal_flags & MMAL_BUFFER_HEADER_FLAG_EOS &&
++ is_capturing(dev)) {
++ v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,
++ "Grab another frame as buffer has EOS");
++ vchiq_mmal_port_parameter_set(instance,
++ dev->capture.camera_port,
++ MMAL_PARAMETER_CAPTURE,
++ &dev->capture.frame_count,
++ sizeof(dev->capture.frame_count));
++ }
+ }
+
+ static int enable_camera(struct bm2835_mmal_dev *dev)
+@@ -823,27 +827,27 @@ static int vidioc_overlay(struct file *f
+
+ ret = vchiq_mmal_port_set_format(dev->instance, src);
+ if (ret < 0)
+- goto error;
++ return ret;
+
+ ret = set_overlay_params(dev, dst);
+ if (ret < 0)
+- goto error;
++ return ret;
+
+ if (enable_camera(dev) < 0)
+- goto error;
++ return ret;
+
+ ret = vchiq_mmal_component_enable(
+ dev->instance,
+ dev->component[MMAL_COMPONENT_PREVIEW]);
+ if (ret < 0)
+- goto error;
++ return ret;
+
+ v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev, "connecting %p to %p\n",
+ src, dst);
+ ret = vchiq_mmal_port_connect_tunnel(dev->instance, src, dst);
+ if (!ret)
+ ret = vchiq_mmal_port_enable(dev->instance, src, NULL);
+-error:
++
+ return ret;
+ }
+