Age | Commit message (Collapse) | Author |
|
From: Guennadi Liakhovetski <lg@denx.de>
Move mutex from host drivers to camera device object, take into account
videobuf locking.
Signed-off-by: Guennadi Liakhovetski <lg@denx.de>
---
drivers/media/video/pxa_camera.c | 15 ++---
drivers/media/video/sh_mobile_ceu_camera.c | 9 +--
drivers/media/video/soc_camera.c | 99 +++++++++++++++++++++++-----
include/media/soc_camera.h | 8 ++-
4 files changed, 96 insertions(+), 35 deletions(-)
|
|
From: Hans Verkuil <hverkuil@xs4all.nl>
Priority: normal
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
|
|
From: Magnus Damm <damm@igel.co.jp>
Add clock framework support to the sh_mobile ceu and
adjust the board specific code accordingly.
Signed-off-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
kernel-sync:
---
|
|
From: Hans Verkuil <hverkuil@xs4all.nl>
Priority: normal
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
|
|
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
|
|
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
|
|
From: Guennadi Liakhovetski <lg@denx.de>
With the introduction of the format conversion support in soc-camera, we now
also have to take care to pass the correct pixel format to the camera driver
when calling its try_fmt() method.
Signed-off-by: Guennadi Liakhovetski <lg@denx.de>
---
drivers/media/video/pxa_camera.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
|
|
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Simplify multiple drivers by replacing f->fmt.pix.* with a single pointer
dereference, merge some needlessly broken lines, verify host and camera
operations pointers on registration.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---
drivers/media/video/mt9m001.c | 20 ++++----
drivers/media/video/mt9m111.c | 10 ++--
drivers/media/video/mt9v022.c | 20 ++++----
drivers/media/video/pxa_camera.c | 21 +++-----
drivers/media/video/soc_camera.c | 74 +++++++++++++++++------------
drivers/media/video/soc_camera_platform.c | 5 +-
6 files changed, 81 insertions(+), 69 deletions(-)
|
|
From: Magnus Damm <damm@igel.co.jp>
This patch converts the sh_mobile_ceu driver to make use
of the new pixel format translation code. Only pass-though
mode at this point.
Signed-off-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---
drivers/media/video/sh_mobile_ceu_camera.c | 83 +++++++++++++++++++---------
1 files changed, 57 insertions(+), 26 deletions(-)
|
|
From: Magnus Damm <damm@igel.co.jp>
This patch adds support for NV16 and NV61 pixel formats.
These pixel formats use two planes; one for 8-bit Y values and
one for interleaved 8-bit U and V values. NV16/NV61 formats are
very similar to NV12/NV21 with the exception that NV16/NV61 are
using the same number of lines for both planes. The difference
between NV16 and NV61 is the U and V byte order.
The fourcc values are extrapolated from the NV12/NV21 case.
Signed-off-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---
include/linux/videodev2.h | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
|
|
From: Mike Rapoport <mike@compulab.co.il>
Signed-off-by: Mike Rapoport <mike@compulab.co.il>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---
drivers/media/video/Kconfig | 4 ++--
drivers/media/video/mt9m111.c | 28 ++++++++++++++++------------
2 files changed, 18 insertions(+), 14 deletions(-)
|
|
From: Mike Rapoport <mike@compulab.co.il>
The chip is largely compatible with MT9M111 and is going to be supported by the
same driver.
Signed-off-by: Mike Rapoport <mike@compulab.co.il>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---
include/media/v4l2-chip-ident.h | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
|
|
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Using PXA270's FIFO inactivity time-out register (CITOR) reduces FIFO overruns.
The time-out is calculated in CICLK / LCDCLK ticks and has to be longer than
one pixel time. For this we have to know the pixel clock frequency, which
usually is provided by the camera. We use the struct soc_camera_sense to
request PCLK frequency from the camera driver upon each data format change.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Tested-by: Robert Jarzmik <robert.jarzmik@free.fr>
---
drivers/media/video/pxa_camera.c | 90 +++++++++++++++++++++++++++++---------
1 files changed, 69 insertions(+), 21 deletions(-)
|
|
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Add a struct soc_camera_sense, that can be used by camera host drivers to
request additional information from a camera driver, for example, when
changing data format. This struct can be extended in the future, its first use
is to request the camera driver whether the pixel-clock frequency has changed.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Tested-by: Robert Jarzmik <robert.jarzmik@free.fr>
---
include/media/soc_camera.h | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
|
|
From: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---
drivers/media/video/mt9m111.c | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
|
|
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
As reported by Antonio Ospite <ospite@studenti.unina.it> two platforms with a
mt9m111 camera require opposite pixel clock polarity, which means one of them
inverts it. This patch adds support for inversion flags and switches all
available camera drivers to using them.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---
drivers/media/video/mt9m001.c | 15 +++++++--------
drivers/media/video/mt9m111.c | 6 +++++-
drivers/media/video/mt9v022.c | 3 +++
drivers/media/video/ov772x.c | 10 +++++-----
drivers/media/video/soc_camera.c | 34 ++++++++++++++++++++++++++++++++++
include/media/soc_camera.h | 11 +++++++++++
6 files changed, 65 insertions(+), 14 deletions(-)
|
|
From: Hans Verkuil <hverkuil@xs4all.nl>
Priority: normal
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
|
|
From: Hans Verkuil <hverkuil@xs4all.nl>
Priority: normal
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
|
|
From: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
|
|
From: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Eric Miao <eric.miao@marvell.com>
Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
kernel-sync:
|
|
From: Kuninori Morimoto <morimoto.kuninori@renesas.com>
Signed-off-by: Kuninori Morimoto <morimoto.kuninori@renesas.com>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---
drivers/media/video/ov772x.c | 22 ++++++++++++++++++++++
include/media/v4l2-chip-ident.h | 1 +
2 files changed, 23 insertions(+), 0 deletions(-)
|
|
From: Kuninori Morimoto <morimoto.kuninori@renesas.com>
Signed-off-by: Kuninori Morimoto <morimoto.kuninori@renesas.com>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
|
|
From: Darron Broad <darron@kewl.org>
This cleans-up the advise/acquire methods.
This has been tested on the hvr-1300/4000 and assumed to be
correct on the hvr-3000.
This update also fixes analogue tuning on the hvr-1300
when in blackbird mode.
Priority: normal
Signed-off-by: Darron Broad <darron@kewl.org>
CC: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
|
|
From: Darron Broad <darron@kewl.org>
Slow tuning, EG:
> szap-s2 -r -c 39.FTATV "1=Pgm1;Net1"
reading channels from file '39.FTATV'
zapping to 3 '1=Pgm1;Net1':
delivery DVB-S, modulation QPSK
sat 0, frequency 11140 MHz V, symbolrate 1425000, coderate 5/6, rolloff 0.35
vpid 0x0200, apid 0x0300, sid 0x0001
using '/dev/dvb/adapter0/frontend0' and '/dev/dvb/adapter0/demux0'
status 00 | signal c2c0 | snr 0000 | ber 00012d4a | unc 00000000 |
status 03 | signal ff80 | snr 0000 | ber 00000000 | unc 00000000 |
status 01 | signal ff80 | snr 0000 | ber 00000000 | unc 00000000 |
status 01 | signal ff80 | snr 0000 | ber 00000000 | unc 00000000 |
status 03 | signal c040 | snr 0000 | ber 00000000 | unc 00000000 |
status 03 | signal ff80 | snr 0000 | ber 00000000 | unc 00000000 |
status 01 | signal ff80 | snr 0000 | ber 00000000 | unc 00000000 |
status 03 | signal c040 | snr 0000 | ber 00000000 | unc 00000000 |
status 01 | signal ff80 | snr 0000 | ber 00000000 | unc 00000000 |
status 01 | signal ff80 | snr 0000 | ber 00000000 | unc 00000000 |
status 01 | signal c040 | snr 0000 | ber 00000000 | unc 00000000 |
status 01 | signal ff80 | snr 0000 | ber 00000000 | unc 00000000 |
status 01 | signal ff80 | snr 0000 | ber 00000000 | unc 00000000 |
status 01 | signal c040 | snr 0000 | ber 00000000 | unc 00000000 |
status 03 | signal c040 | snr 0000 | ber 00000000 | unc 00000000 |
status 1f | signal c040 | snr bb33 | ber 00000000 | unc 00000000 | FE_HAS_LOCK
Appears to be resolved by dropping zig-zag tuning and relying on
hardware only:
> szap-s2 -r -c 39.FTATV "1=Pgm1;Net1"
reading channels from file '39.FTATV'
zapping to 3 '1=Pgm1;Net1':
delivery DVB-S, modulation QPSK
sat 0, frequency 11140 MHz V, symbolrate 1425000, coderate 5/6, rolloff 0.35
vpid 0x0200, apid 0x0300, sid 0x0001
using '/dev/dvb/adapter0/frontend0' and '/dev/dvb/adapter0/demux0'
status 01 | signal ff80 | snr 0000 | ber 00000000 | unc 00000000 |
status 1f | signal ff80 | snr c199 | ber 00000000 | unc 00000000 | FE_HAS_LOCK
status 1f | signal c040 | snr c199 | ber 00000000 | unc 00000000 | FE_HAS_LOCK
status 1f | signal ff80 | snr c199 | ber 00000000 | unc 00000000 | FE_HAS_LOCK
Tuning to a weaker channel shows that the hardware recovers sync:
status 1f | signal fe40 | snr 5199 | ber 00000000 | unc 00000000 | FE_HAS_LOCK
status 03 | signal fd40 | snr 5000 | ber 00000000 | unc 00000000 |
status 1f | signal fe40 | snr 5000 | ber 00000000 | unc 00000000 | FE_HAS_LOCK
status 03 | signal fd80 | snr 5000 | ber 00000000 | unc 00000000 |
status 01 | signal fd80 | snr 4e66 | ber 00000000 | unc 00000000 |
status 1f | signal fe40 | snr 5000 | ber 00000000 | unc 00000000 | FE_HAS_LOCK
status 03 | signal fe40 | snr 5000 | ber 00000000 | unc 00000000 |
status 01 | signal fd80 | snr 0000 | ber 00000000 | unc 00000000 |
status 1f | signal fe40 | snr 5199 | ber 00000000 | unc 00000000 | FE_HAS_LOCK
Also, tuning, moving the dish and then restoring the dish also retunes.
Priority: normal
Signed-off-by: Darron Broad <darron@kewl.org>
CC: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
|
|
From: Darron Broad <darron@kewl.org>
It has been noticed that in HW tuning mode in cx24123.c that
a check is made to not alter the status var when in one shot
mode, a simpler solution is to not update here for all cards.
Priority: normal
Signed-off-by: Darron Broad <darron@kewl.org>
CC: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
|
|
From: Darron Broad <darron@kewl.org>
Thanks to AKPM for spotting this.
Priority: normal
CC: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Darron Broad <darron@kewl.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
|
|
From: Darron Broad <darron@kewl.org>
Delsys was missing when searching for FEC in table.
This fixes FEC lookup for DVB-S2 QPSK modulation.
Priority: normal
CC: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Darron Broad <darron@kewl.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
|
|
From: Mauro Carvalho Chehab <mchehab@redhat.com>
tuner-xc3028 can be put to sleep to save power. However, if not properly
recovered from sleep, the device won't work. It is noticed that some
devices doesn't recover properly, so let's add a dump_stack() as a debug
option, to allow us to track when this happens.
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
|
|
From: Jean-Francois Moine <moinejf@free.fr>
Priority: normal
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
|
|
From: Jean-Francois Moine <moinejf@free.fr>
Priority: normal
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
|
|
From: Kuninori Morimoto <morimoto.kuninori@renesas.com>
Signed-off-by: Kuninori Morimoto <morimoto.kuninori@renesas.com>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---
drivers/media/video/ov772x.c | 21 +++------------------
1 files changed, 3 insertions(+), 18 deletions(-)
|
|
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Testing for non-NULL platform-data is not enough, we have to check if the GPIO
in the platform data is valid or not. Also see my earlier patch:
[ARM] pxa/pcm990: use negative number for an invalid GPIO in camera data
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---
drivers/media/video/mt9m001.c | 5 +++--
drivers/media/video/mt9v022.c | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
|
|
From: Robert Jarzmik <robert.jarzmik@free.fr>
The Micron mt9m111 offers 4 byte orders for YCbCr
output. This patchs adds all possible outputs capabilities
to the mt9m111 driver.
Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---
drivers/media/video/mt9m111.c | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
|
|
From: roel kluin <roel.kluin@gmail.com>
unsigned >= 0 is always true and fix formula
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---
drivers/media/video/mt9m111.c | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
|
|
From: Devin Heitmueller <dheitmueller@linuxtv.org>
The init_fw option was broken for the HVR-950q because we would call the reset
callback inside of dvb_attach() and the callback had not been setup yet.
Michael Krufky (who added the init_fw feature) says it's no longer required,
so just remove the option completely.
Thanks to user Zzeiss from #linuxtv chat for reporting the issue and
Michael Krufky <mkrufky@linuxtv.org> for proposing the fix.
Priority: normal
Signed-off-by: Devin Heitmueller <dheitmueller@linuxtv.org>
Acked-by: Michael Krufky <mkrufky@linuxtv.org>
|
|
From: Devin Heitmueller <dheitmueller@linuxtv.org>
Don't operate under the assumption that every device that uses the em2820
default USB ID is a Prolink PlayTV USB. We have an eeprom hash, so use that,
since otherwise we cannot support other devices with the 2820 default USB ID
(such as the ADS Tech Instant TV USB USBAV-704)
Priority: normal
Signed-off-by: Devin Heitmueller <dheitmueller@linuxtv.org>
|
|
From: Devin Heitmueller <dheitmueller@linuxtv.org>
Add the em2870 to the list of known em28xx chip ids.
Priority: normal
Signed-off-by: Devin Heitmueller <dheitmueller@linuxtv.org>
|
|
From: Devin Heitmueller <dheitmueller@linuxtv.org>
Fix a NULL pointer dereference that would occur if the video decoder tied to
the em28xx supports the VIDIOC_INT_RESET call (for example: the cx25840 driver)
Priority: high
Signed-off-by: Devin Heitmueller <dheitmueller@linuxtv.org>
|
|
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Changes/fixes on em28xx dev->lock:
- em28xx_init_dev() were unlocking without a previous lock;
- some read ioctls need to lock after the removal of KBL, since a write
may be happening at the same time an ioctl is reading;
- keep the device locked during all device initialization;
- lock/unlock while reading/writing registers.
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
|
|
From: Mauro Carvalho Chehab <mchehab@redhat.com>
vidioc_try_fmt_vid_cap() just checks if a given resolution is supported.
It doesn't touch on struct em28xx device descriptor. so, there's no need
to lock.
While there, use unlikely() for those values that aren't likely to
occur.
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
|
|
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
|
|
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
|
|
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Changeset 9886 were applied by mistake, reverting changeset 9885, that
got a wrong comment. Let's revert it.
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
|
|
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
|
|
From: Laurent Pinchart <laurent.pinchart@skynet.be>
When the first bulk URB of a video payload contains an erroneous header, or
when no V4L2 buffer is available, the whole payload must be dropped. Change
the skip logic to drop all bulk URBs until the end of the payload instead of
the first one only.
Priority: normal
Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be>
|
|
From: Hans Verkuil <hverkuil@xs4all.nl>
The v4l_compat_ioctl32() function only tested for the presence of the
ioctl op, not for unlocked_ioctl. So it would always return an error
when used with drivers that use unlocked_ioctl instead of ioctl.
Priority: high
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
|
|
From: Laurent Pinchart <laurent.pinchart@skynet.be>
Add support for absolute and continuous zoom controls (mapped to absolute
and relative UVC zoom controls).
Priority: normal
Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be>
|
|
From: Laurent Pinchart <laurent.pinchart@skynet.be>
Priority: normal
Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be>
|
|
From: Mauro Carvalho Chehab <mchehab@redhat.com>
tvp514x were written using newer i2c improvements committed on kernel
2.6.26. So, we need to not compile it with older kernels.
As pointed by Devin Heitmueller <devin.heitmueller@gmail.com>:
Reported by a user on the #linuxtv chatroom and confirmed by mkrufky:
make -C /home/wil/v4l-dvb/v4l
make[1]: Entering directory `/home/wil/v4l-dvb/v4l'
creating symbolic links...
Kernel build directory is /lib/modules/2.6.24-20-generic/build
make -C /lib/modules/2.6.24-20-generic/build
SUBDIRS=/home/wil/v4l-dvb/v4l modules
make[2]: Entering directory `/usr/src/linux-headers-2.6.24-20-generic'
CC [M] /home/wil/v4l-dvb/v4l/tvp514x.o
/home/wil/v4l-dvb/v4l/tvp514x.c: In function 'ioctl_s_power':
/home/wil/v4l-dvb/v4l/tvp514x.c:1238: error: dereferencing pointer to
incomplete type
/home/wil/v4l-dvb/v4l/tvp514x.c: At top level:
/home/wil/v4l-dvb/v4l/tvp514x.c:1524: error: array type has incomplete
element type
/home/wil/v4l-dvb/v4l/tvp514x.c:1539: warning: initialization from
incompatible pointer type
/home/wil/v4l-dvb/v4l/tvp514x.c:1541: error: unknown field 'id_table'
specified in initializer
make[3]: *** [/home/wil/v4l-dvb/v4l/tvp514x.o] Error 1
make[2]: *** [_module_/home/wil/v4l-dvb/v4l] Error 2
make[2]: Leaving directory `/usr/src/linux-headers-2.6.24-20-generic'
make[1]: *** [default] Error 2
make[1]: Leaving directory `/home/wil/v4l-dvb/v4l'
make: *** [all] Error 2
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
|
|
From: Hans Verkuil <hverkuil@xs4all.nl>
Priority: normal
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
|