diff options
author | Florian Fainelli <florian@openwrt.org> | 2014-02-28 20:30:08 +0000 |
---|---|---|
committer | Florian Fainelli <florian@openwrt.org> | 2014-02-28 20:30:08 +0000 |
commit | 800930b924c19a56b3a6e94ad351cd0715fb410d (patch) | |
tree | 70158d97f68604d69da8da779507469cf930bf07 /target/linux/brcm2708/patches-3.10/0138-V4L2-Fix-information-advertised-through-g_vidfmt.patch | |
parent | 68c939ba0b0a0dda84e7a2ae370155be9a5593bc (diff) | |
download | upstream-800930b924c19a56b3a6e94ad351cd0715fb410d.tar.gz upstream-800930b924c19a56b3a6e94ad351cd0715fb410d.tar.bz2 upstream-800930b924c19a56b3a6e94ad351cd0715fb410d.zip |
brcm2708: update against latest rpi-3.10.y branch
Update our copies of the brcm2708 patches to the latest rpi-3.10-y
rebased against linux-3.10.y stable (3.10.32). This should hopefully
make it easier for us in the future to leverage the raspberry/rpi-*
branches.
Signed-off-by: Florian Fainelli <florian@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39770 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm2708/patches-3.10/0138-V4L2-Fix-information-advertised-through-g_vidfmt.patch')
-rw-r--r-- | target/linux/brcm2708/patches-3.10/0138-V4L2-Fix-information-advertised-through-g_vidfmt.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-3.10/0138-V4L2-Fix-information-advertised-through-g_vidfmt.patch b/target/linux/brcm2708/patches-3.10/0138-V4L2-Fix-information-advertised-through-g_vidfmt.patch new file mode 100644 index 0000000000..984bfa3c7b --- /dev/null +++ b/target/linux/brcm2708/patches-3.10/0138-V4L2-Fix-information-advertised-through-g_vidfmt.patch @@ -0,0 +1,37 @@ +From afd8800a96b940049ac37fb90cc24deeeea5c57e Mon Sep 17 00:00:00 2001 +From: Dave Stevenson <dsteve@broadcom.com> +Date: Mon, 9 Dec 2013 17:29:39 +0000 +Subject: [PATCH 138/174] V4L2: Fix information advertised through g_vidfmt + +Width and height were being stored based on incorrect +values. + +Signed-off-by: Dave Stevenson <dsteve@broadcom.com> +--- + drivers/media/platform/bcm2835/bcm2835-camera.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +--- a/drivers/media/platform/bcm2835/bcm2835-camera.c ++++ b/drivers/media/platform/bcm2835/bcm2835-camera.c +@@ -1028,13 +1028,19 @@ static int mmal_setup_components(struct + if (!ret) { + dev->capture.fmt = mfmt; + dev->capture.stride = f->fmt.pix.bytesperline; +- dev->capture.width = port->es.video.crop.width; +- dev->capture.height = port->es.video.crop.height; ++ dev->capture.width = camera_port->es.video.crop.width; ++ dev->capture.height = camera_port->es.video.crop.height; + + /* select port for capture */ + dev->capture.port = port; + dev->capture.camera_port = camera_port; + dev->capture.encode_component = encode_component; ++ v4l2_dbg(1, bcm2835_v4l2_debug, ++ &dev->v4l2_dev, ++ "Set dev->capture.fmt %08X, %dx%d, stride %d", ++ port->format.encoding, ++ dev->capture.width, dev->capture.height, ++ dev->capture.stride); + } + } + |