summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video
AgeCommit message (Collapse)Author
2009-09-12backport commit 720b17e759a50635c429ccaa2ec3d01edb4f92d6Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> kernel-sync: Author: Magnus Damm <damm@igel.co.jp> Date: Tue Jun 16 15:32:36 2009 -0700 videobuf-dma-contig: zero copy USERPTR support Since videobuf-dma-contig is designed to handle physically contiguous memory, this patch modifies the videobuf-dma-contig code to only accept a user space pointer to physically contiguous memory. For now only VM_PFNMAP vmas are supported, so forget hotplug. On SuperH Mobile we use this with our sh_mobile_ceu_camera driver together with various multimedia accelerator blocks that are exported to user space using UIO. The UIO kernel code exports physically contiguous memory to user space and lets the user space application mmap() this memory and pass a pointer using the USERPTR interface for V4L2 zero copy operation. With this approach we support zero copy capture, hardware scaling and various forms of hardware encoding and decoding. Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-09-08em28xx: Cleanups at ir_i2c handlerMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> There are some extra parenthesis at the clauses, and some switch() tests for boards that don't have i2c ir. Remove those extra code. Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-09-08em28xx: properly load ir-kbd-i2c when neededMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Currently, the logic to load ir i2c ancillary module is broken. It is associated to Hauppauge devices with IR flag on their eeprom, no matter if the device uses i2c or em28xx direct IR support. That's wrong. Instead, add a flag to the boards that use i2c IR chips and load the module only for those devices and if ir is not disabled. Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-09-07building system: fix compilation with kernels older than 2.6.30Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-09-07merge: http://bitbucket.org/brijohn/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-09-07changeset: 12701:86bff049a6fbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> tag: tip user: Mauro Carvalho Chehab <mchehab@redhat.com> date: Mon Sep 07 01:30:10 2009 -0300 files: linux/drivers/media/video/saa7134/saa7134-input.c linux/drivers/media/video/saa7134/saa7134.h description: SAA7134: ir-kbd-i2c initialization data should point to a persistent object ir-kbd-i2c's ir_probe() function can be called much later (i.e. at ir-kbd-i2c module load), than the lifetime of a struct IR_i2c_init_data allocated off of the stack in cx18_i2c_new_ir() at registration time. Make sure we pass a pointer to a persistent IR_i2c_init_data object at i2c registration time. Thanks to Brain Rogers, Dustin Mitchell, Andy Walls and Jean Delvare to rise this question. Before this patch, if ir-kbd-i2c were probed after SAA7134, trash data were used. Compile tested only, but the patch is identical to em28xx one. So, it should work properly. Priority: high Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-09-07merge: http://linuxtv.org/hg/~awalls/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-09-07em28xx: ir-kbd-i2c initialization data should point to a persistent objectMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> ir-kbd-i2c's ir_probe() function can be called much later (i.e. at ir-kbd-i2c module load), than the lifetime of a struct IR_i2c_init_data allocated off of the stack in cx18_i2c_new_ir() at registration time. Make sure we pass a pointer to a persistent IR_i2c_init_data object at i2c registration time. Thanks to Brain Rogers, Dustin Mitchell, Andy Walls and Jean Delvare to rise this question. Before this patch, if ir-kbd-i2c were probed after em28xx, trash data were used. After the patch, no matter what order, it is properly reported as tested by me: input: i2c IR (i2c IR (EM2840 Hauppaug as /class/input/input10 ir-kbd-i2c: i2c IR (i2c IR (EM2840 Hauppaug detected at i2c-4/4-0030/ir0 [em28xx #0] Priority: high Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-09-07merge: http://linuxtv.org/hg/~jfrancois/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-09-07merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-09-06merge: http://linuxtv.org/hg/~hgoede/gspca/Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-09-05cx18: ir-kbd-i2c initialization data should point to a persistent objectAndy Walls
From: Andy Walls <awalls@radix.net> ir-kbd-i2c's ir_probe() function can be called much later (i.e. at ir-kbd-i2c module load), than the lifetime of a struct IR_i2c_init_data allocated off of the stack in cx18_i2c_new_ir() at registration time. Make sure we pass a pointer to a persistent IR_i2c_init_data object at i2c registration time. Thanks to Brain Rogers for pointing out a solution, and Dustin Mitchell for testing against a 2.6.30 kernel. Reported-by: Dustin Mitchell <soxslayer@gmail.com> Reported-by: Brian Rogers <brian@xyzw.org> Priority: high Tested-by: Dustin Mitchell <soxslayer@gmail.com> Signed-off-by: Andy Walls <awalls@radix.net>
2009-09-03gspca - sn9c20x: Add SXGA support to MT9M111Brian Johnson
From: Brian Johnson <brijohn@gmail.com> Priority: normal Signed-off-by: Brian Johnson <brijohn@gmail.com>
2009-09-03gspca - sn9c20x: disable exposure/gain controls for MT9M111 sensors.Brian Johnson
From: Brian Johnson <brijohn@gmail.com> Using the MT9M111's IFP to handle exposure/gain gives better results. Priority: normal Signed-off-by: Brian Johnson <brijohn@gmail.com>
2009-09-03gspca_mr97310a: Add one more vivitar mini cam to the list of CIF camshans@rhel5-devel.localdomain
From: Hans de Goede <hdegoede@redhat.com> gspca_mr97310a: Add one more vivitar mini cam to the list of CIF cams Priority: normal Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2009-09-02gspca - sn9c20x: Add SXGA support to SOI968Brian Johnson
From: Brian Johnson <brijohn@gmail.com> Priority: normal Signed-off-by: Brian Johnson <brijohn@gmail.com>
2009-09-02gspca - sn9c20x: Fix exposure on SOI968 sensorsBrian Johnson
From: Brian Johnson <brijohn@gmail.com> Fixes broken exposure on SOI968 webcams that was causing the camera to display a black screen Priority: high Signed-off-by: Brian Johnson <brijohn@gmail.com>
2009-09-02gspca_mr97310a: Allow overriding of detected sensor typehans@rhel5-devel.localdomain
From: Hans de Goede <hdegoede@redhat.com> gspca_mr97310a: Allow overriding of detected sensor type Priority: normal Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2009-09-02gspca - sn9c20x: Reduces size of objectBrian Johnson
From: Joe Perches <joe@perches.com> Use s16 instead of int where possible. Use struct instead of arrays Priority: normal Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Brian Johnson <brijohn@gmail.com>
2009-09-01vino: add missing compat.h include.Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> vino needs compat.h to get the I2C_ADDRS macro on kernels < 2.6.31. Priority: normal Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2009-09-01gspca - sonixj / sn9c102: Two drivers for 0c45:60fc and 0c45:613e.Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> Let 0c45:60fc in sn9c102 and 0c45:613e in gspca-sonixj (sensor not supported). Priority: normal Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2009-09-01gspca - vc032x: Do the LED work with the sensor hv7131r.Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> Priority: normal Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2009-09-01gspca - vc032x: Change the start exchanges of the sensor hv7131r.Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> The new exchanges are taken from the information file of the ms-win driver (usbvm326.inf - webcam 15b8:6002). Priority: normal Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2009-09-02gspca - sunplus: The brightness is signed.Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> Priority: normal Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2009-09-01merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-08-31cx25840: fix determining the firmware nameHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Depending on the model there are three different firmwares to choose from. Unfortunately if a cx23885 is loaded first, then the global firmware name is overwritten with that firmware and if ivtv is loaded next, then it tries to load the wrong firmware. In addition, the original approach would also overwrite any firmware that the user specified explicitly. Priority: normal Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> CC: Jarod Wilson <jarod@wilsonet.com>
2009-08-31gspca - sunplus: Optimize code.Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> Priority: normal Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2009-08-30em28xx: Add entry for GADMEI UTV330+ and related IR keymapMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Priority: normal Signed-off-by: Shine Liu <shinel@foxmail.com> [mchehab@redhat.com: Fix a few wrong IR keymaps] Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-08-29common/ir: use a struct for keycode tablesMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Currently, V4L uses a scancode table whose index is the scancode and the value is the keycode. While this works, it has some drawbacks: 1) It requires that the scancode to be at the range 00-7f; 2) keycodes should be masked on 7 bits in order for it to work; 3) due to the 7 bits approach, sometimes it is not possible to replace the default keyboard to another one with a different encoding rule; 4) it is different than what is done with dvb-usb approach; 5) it requires a typedef for it to work. This is not a recommended Linux CodingStyle. This patch is part of a larger series of IR changes. It basically replaces the IR_KEYTAB_TYPE tables by a structured table: struct ir_scancode { u16 scancode; u32 keycode; }; This is very close to what dvb does. So, a further integration with DVB code will be easy. While we've changed the tables, for now, the IR keycode handling is still based on the old approach. The only notable effect is the redution of about 35% of the ir-common module size: text data bss dec hex filename 6721 29208 4 35933 8c5d old/ir-common.ko 5756 18040 4 23800 5cf8 new/ir-common.ko In thesis, we could be using above u8 for scancode, reducing even more the size of the module, but defining it as u16 is more convenient, since, on dvb, each scancode has up to 16 bits, and we currently have a few troubles with rc5, as their scancodes are defined with more than 8 bits. This patch itself shouldn't be doing any functional changes. Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-08-29Add support for RoverMedia TV Link Pro FMMauro Carvalho Chehab
From: Eugene Yudin <eugene.yudin@gmail.com> This patch add support for RoverMedia TV Link Pro FM (LR138 REV:I) card based on saa7134. Priority: normal Signed-off-by: Eugene Yudin <Eugene.Yudin@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-08-29gspca - sonixj: Don't use mdelay().Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> Priority: normal Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2009-08-26Add support BeholdTV X7 cardMauro Carvalho Chehab
From: Dmitri Belimov <d.belimov@gmail.com> Add support our new TV card based on xc5000 and saa7134. Analog TV works well. Priority: normal Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov <d.belimov@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-08-25gspca - pac7311: Webcam 06f8:3009 added.Jean-Francois Moine
From: Stephane Marguet (Stemp) <smarguet@gmail.com> Priority: normal Signed-off-by: Stephane Marguet (Stemp) <smarguet@gmail.com> Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2009-08-22Update ALSA capture controls according to selected source.Mauro Carvalho Chehab
From: Oldřich Jedlička <oldium.pro@seznam.cz> The patch introduces new snd_saa7134_capsrc_set (code taken from snd_saa7134_capsrc_put) that updates also the ALSA capture controls during snd_card_saa7134_capture_prepare and snd_saa7134_capsrc_put. There can be much more work done in order to unify the control of the card (now the card's capture source is tuned/switched in saa7134-video.c too), but I don't have enough time. This work could be a starting point, but it can be applied as-is too (it doesn't need any further work to make it working). Signed-off-by: Oldřich Jedlička <oldium.pro@seznam.cz> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-08-22Add remote support to cph03x bttv cardMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Hello kernel developers. I found a bug report from an user in launchpad. I just copy it here. It includes patch. I don't own the necessary hardware to test it but the patch looks trivial. I'm not subscribed to this list, so please CC me. Thanks! Here is the text: """ remote control for my tv card doesnt work I have Askey CPH03x TV Capturer. When I load bttv module with "card=59" option which is proper for this tv card, I can watch tv with sound but my remote control doesnt work. There is no ir event in /proc/bus/input/device . When bttv module is loaded with "card=137" option remote control works very well. $ cat /proc/bus/input/devices ....... ........ : Bus=0001 Vendor=109e Product=0350 Version=0001 N: Name="bttv IR (card=137)" P: Phys=pci-0000:00:0d.0/ir0 S: Sysfs=/devices/pci0000:00/0000:00:0d.0/input/input144 U: Uniq= H: Handlers=kbd event6 B: EV=100003 B: KEY=2c0814 100004 0 0 0 4 2008000 2090 2001 1e0000 4400 0 ffc Unfortunately there is no sound. """ https://bugs.launchpad.net/ubuntu/+bug/239733 http://bugzilla.kernel.org/show_bug.cgi?id=11995 -- Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-08-17gspca_mr97310a: Use correct register for CIF type 1 sensor gain settingshans@rhel5-devel.localdomain
From: Hans de Goede <hdegoede@redhat.com> gspca_mr97310a: Use correct register for CIF type 1 sensor gain settings Priority: normal Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2009-08-14gspca_mr97310a: Add controls for CIF type 0 sensor camshans@rhel5-devel.localdomain
From: Hans de Goede <hdegoede@redhat.com> gspca_mr97310a: Add controls for CIF type 0 sensor cams Priority: normal Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2009-08-14gspca_mr97310a: make the probing a bit less chattyhans@rhel5-devel.localdomain
From: Hans de Goede <hdegoede@redhat.com> gspca_mr97310a: make the probing a bit less chatty Priority: normal Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2009-08-14gspca_mr97310a: Move detection of CIF sensor type to probe() functionhans@rhel5-devel.localdomain
From: Hans de Goede <hdegoede@redhat.com> gspca_mr97310a: Move detection of CIF sensor type to probe() function, so that the right controls are set to disabled from the start, rather then having them disappear all of a sudden when the stream is started. Priority: normal Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2009-08-14gspca_mr97310a: cleanup/fixup control handlinghans@rhel5-devel.localdomain
From: Hans de Goede <hdegoede@redhat.com> gspca_mr97310a: cleanup/fixup control handling Priority: normal Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2009-08-14gspca: mr97310a fix detection of sensortype for vivicam with id byte of 0x53hans@rhel5-devel.localdomain
From: Hans de Goede <hdgoede@redhat.com> gspca: mr97310a fix detection of sensortype for vivicam with id byte of 0x53 Priority: normal Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2009-08-14gspca: mr97310a add support for CIF and more VGA camera'shans@rhel5-devel.localdomain
From: Theodore Kilgore <kilgota@auburn.edu> This patch adds supports for mr97310a camera's with CIF sensors (2 different types) and for VGA mr97310a camera with a different sensor then supported until now. This patch also add support for controls for one of the 2 CIF sensors, this was written by Thomas Kaiser <thomas@kaiser-linux.li> Priority: normal Signed-off-by: Theodore Kilgore <kilgota@auburn.edu> Signed-off-by: Thomas Kaiser <thomas@kaiser-linux.li> Signed-off-by: Hans de Goede <hdgoede@redhat.com>
2009-08-30merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-08-29soc-camera: remove now unneeded subdevice group ID assignmentsGuennadi Liakhovetski
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Since we are not using v4l2_device_call_* calls any more, we don't need to initialise subdevice .grp_id any more. This also fixes compiler warnings on 64-bit platforms. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> --- drivers/media/video/soc_camera.c | 1 - drivers/media/video/soc_camera_platform.c | 1 - 2 files changed, 0 insertions(+), 2 deletions(-)
2009-08-26support AverMedia Studio 505Mauro Carvalho Chehab
From: Vasiliy Temnikov <vaka@newmail.ru> Added support to AverMedia Studio 505 Priority: normal Signed-off-by: Vasiliy Temnikov <vaka@newmail.ru> [dougsland@redhat.com: fixed rejects and removed the change to add dk as default secam variant] [mchehab@redhat.com: fix a few CodingStyle issues] Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-08-11v4l2: video device: Add FM TX controls default configurationsMauro Carvalho Chehab
From: Eduardo Valentin <eduardo.valentin@nokia.com> This patch adds basic configurations for FM TX extended controls. That includes controls names, menu strings, pointer identification, type classification and flags configuration. Priority: normal Signed-off-by: Eduardo Valentin <eduardo.valentin@nokia.com> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-08-11v4l: introduce string control support.Mauro Carvalho Chehab
From: Hans Verkuil <hverkuil@xs4all.nl> The upcoming RDS encoder needs support for string controls. This patch implements the core implementation. Priority: normal Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-08-26merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-core2Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-08-26merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-08-26gspca - sn9c20x: Fix gscpa sn9c20x build errors.Jean-Francois Moine
From: Randy Dunlap <randy.dunlap@oracle.com> Reported-by: Toralf Forster <toralf.foerster@gmx.de> Priority: high Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Jean-Francois Moine <moinejf@free.fr>