summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video
AgeCommit message (Collapse)Author
2008-10-14Teach vivi about multiple pixel formatsMauro Carvalho Chehab
From: Magnus Damm <damm@igel.co.jp> This patch contains the ground work to add support for multiple pixel formats to vivi.c Signed-off-by: Magnus Damm <damm@igel.co.jp> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2008-10-14Precalculate vivi yuv valuesMauro Carvalho Chehab
From: Magnus Damm <damm@igel.co.jp> This patch improves the color space conversion code in vivi.c to directly draw with precalculated YUV values as palette instead of drawing with YUV that is calculated from RGB for every two pixels. This way we eliminate the need for 9 multiplications every two pixels. A side effect of this patch is that the time counter is changed from green text on black background to white text on black background. Signed-off-by: Magnus Damm <damm@igel.co.jp> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2008-10-14zoran: Drop redundant printkMauro Carvalho Chehab
From: Jean Delvare <khali@linux-fr.org> There's no point in logging two messages for the same error. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2008-10-13stk-webcam: minor cleanupMauro Carvalho Chehab
From: David Ellingsworth <david@identd.dyndns.org> This patch: 1) removes the unnecessary kref.h include file 2) removes unnecessary pointer validation from read and poll routines. (Neither poll nor read may be called unless a call to open succeeds. A successful call to open will always set the file private_data pointer. Verifying that it is not null is therefore unnecessary. The associated release and mmap calls currently ignore this check.) 3) adds a space to syslog output. 4) removes an unused function prototype. Signed-off-by: David Ellingsworth <david@identd.dyndns.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2008-10-13Correct typo and enable setting the gain on the mt9m111 sensorErik Andrén
From: Erik Andrén <erik.andren@gmail.com> A typo was introduced during the gspca conversion, crippling the ability to control the gain on the mt9m111 sensor. Priority: normal Signed-off-by: Erik Andrén <erik.andren@gmail.com>
2008-10-13Properly iterate the urbs when destroying them.Erik Andrén
From: Erik Andrén <erik.andren@gmail.com> Properly iterate the allocated when freeing the urbs, this fixes a memory leak Priority: normal Signed-off-by: Erik Andrén <erik.andren@gmail.com>
2008-10-13merge: http://linuxtv.org/hg/~stoth/s2Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2008-10-11cx23885: Move the MFE frontend allocation into the correct placeSteven Toth
From: Steven Toth <stoth@linuxtv.org> cx23885 frontend allocation code needs to exist in the higher function, and it also needs to ensure videobug is also correctly initialised on a per frontend basis. This code uses the previous num_frontends patch to safely init each future MFE frontend on a single tsport as as safely as possible - given that we don't have any of those boards. Again, better to add all of this safety code now, while the MFE patch set is fresh in everyone mind, than to try and add it 12-24 months from now, when the subject is cold. Priority: normal Signed-off-by: Steven Toth <stoth@linuxtv.org>
2008-10-11cx23885: Define num_frontends as a function of the portSteven Toth
From: Steven Toth <stoth@linuxtv.org> This allows some cardcoded functions to be more flexible, and paves the way for any future cards that may have MFE support. Better to add it now when the MFE patches is fresh in peoples mind, rather than 12 months from now when new cards appear. Priority: normal Signed-off-by: Steven Toth <stoth@linuxtv.org>
2008-10-11cx23885: MFE related OOPS fixSteven Toth
From: Steven Toth <stoth@linuxtv.org> Bug: the tree generated an oops when the cx23885 was laoded. This avoids the oops by ensuring the mutex is correctly initialised before it's used. Priority: normal Signed-off-by: Steven Toth <stoth@linuxtv.org>
2008-10-11cx88: Add intial config for FM radio supportdarron@kewl.org
From: Darron Broad <darron@kewl.org> This add initial configuration for radio support on the hvr-3000/4000. FM radio doesn't work as yet without further patches (to come), but this prepares for that. Experimental radio support shows that it works when combined with additional audio routing work for cards with an FMD1216ME analogue frontend, but not the MEX variant (more later). Priority: normal Signed-off-by: Darron Broad <darron@kewl.org>
2008-10-11cx88: Add audio routing for the hvr-3000/4000darron@kewl.org
From: Darron Broad <darron@kewl.org> This adds audio routing on the hvr-3000/4000 This is a preliminary patch for later routing requirements. This adds line-in support on the 2 cards mentioned. It is also apparent that there is an initial open fault for line-in when opening composite/s-video. This will be fixed later. It was also noticed that the bit-field for audio routing which was 2 bits needs an increase as the WM8775 for example, allows a value 4 bits wide for it's audio mux. Priority: normal Signed-off-by: Darron Broad <darron@kewl.org>
2008-10-11MFE: Add multi-frontend mutual exclusiondarron@kewl.org
From: Darron Broad <darron@kewl.org> This add frontend R/W mutual exclusion. Prior to this point in time it was possible to open both frontends simultaneously which an MFE card cannot support. In order to stop this, a delayed open is performed which has the following function: Return EBUSY after a configurable amount of time if a frontend is unavailable due to the other being in use. Only allow opening of a frontend if the kernel thread of the other has stopped. This solution was chosen to allow switching between frontends to work as seamlessly as possible. When both frontends are actually opened simultaneously then one will only open, but if quick switching is performed between one of many then the new open will succeed in a clean fashion rather than interrupting a kernel thread. Priority: normal Signed-off-by: Darron Broad <darron@kewl.org>
2008-10-11MFE: cx88: Reset cx22702 on hvr-3000/4000darron@kewl.org
From: Darron Broad <darron@kewl.org> The cx22702 is now always reset on module load. Prior to this the cx22702 was not found on i2c scan without a full reset. Priority: normal Signed-off-by: Darron Broad <darron@kewl.org>
2008-10-11MFE: Add configurable gate controldarron@kewl.org
From: Darron Broad <darron@kewl.org> This adds a configurable (one per card) gate control option for multi-frontend. Prior to this point gate control was assumed to be on the primary frontend, this is a fault when the gate to the analogue section is on the secondary which is the default for both the HVR-3000 and HVR-4000 in MFE. Priority: normal Signed-off-by: Darron Broad <darron@kewl.org>
2008-10-11MFE: bugfix: add missing frontend allocationdarron@kewl.org
From: Darron Broad <darron@kewl.org> When using MFE on a setup with both and HVR-3000 and ASUS P7131 card it was noticed that frontend allocation for saa7134 adapters was missing. This patch adds that allocation for both saa7134 and cx23885 adapters. Priority: normal Signed-off-by: Darron Broad <darron@kewl.org>
2008-10-11MFE: Fix a number of bugs and some tidying updarron@kewl.org
From: Darron Broad <darron@kewl.org> A number of reference to videobuf_dvb_get_frontend used an invalid index. This has been fixed. The section for the HVR3000 in advise_acquire was redundant as the same logic is used on the HVR4000. This has been removed and both cards now use the same function. A number of small errors and whitespace errors are also fixed. Priority: normal Signed-off-by: Darron Broad <darron@kewl.org>
2008-10-11S2API: Add Multiple-frontend on a single adapter support.darron@kewl.org
From: Steven Toth <stoth@linuxtv.org> A detailed description from the original patches 2 years ago: "The WinTV-HVR3000 has a single transport bus which is shared between a DVB-T and DVB-S modulator. These patches build on the bus acquisition cx88 work from a few weeks ago to add support for this. So to applications the HVR3000 looks like this: /dev/dvb/adapter0/fe0 (cx24123 DVB-S demod) /dev/dvb/adapter0/fe1 (cx22702 DVB-T demod) Additional boards continue as before, eg: /dev/dvb/adapter1/fe0 (lgdt3302 ATSC demod) The basic change is removing the single instance of the videobuf_dvb in cx8802_dev and saa7134_dev(?) and replacing it with a list and some supporting functions. *NOTE* This branch was taken before v4l-dvb was closed for 2.6.19 so two or three current cx88 patches appear to be reversed by this tree, this will be cleaned up in the near future. The patches missing change the mutex handing to core->lock, fix an enumeration problem." It should be recognised that a number of people have been maintaining this patchset. Significant levels of Kudos to everyone one involved, including but not limited to: Darron Broad Fabio M. Di Nitto Carlo Scarfoglio Hans Werner Without the work of these people, and countless others, my two year old patches would of died on the Mercurial linuxtv.org vine a long time ago. TODO: Revise these patches a little further so that the need for demux1 and dvr0 is optional, not mandatory on the HVR3000. HISTORY (darron): This is the last update to MFE prepared by Hans which is based upon the `scratchpad' diff created by Carlo. All MFE work prior to that point must be attributed to Fabio who ported and maintained Steve's original patch up to that time. Priority: normal Signed-off-by: Steven Toth <stoth@linuxtv.org> Signed-off-by: Darron Broad <darron@kewl.org>
2008-10-11ivtv: partially revert an earlier patch that checks the max image heightHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Ian Armstrong pointed out to me that it is perfectly valid to have a 576 lines YUV video with NTSC output in this particular case. In fact, without this the X driver for ivtv does not function properly. Reverted my earlier change that restrictred the height to 480 for NTSC and add the comments provided by Ian to explain what is happening here. Priority: normal Thanks-to: Ian Armstrong <ian@iarmst.co.uk> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-10-11ivtv: yuv write() error handling tweakHans Verkuil
From: Ian Armstrong <ian@iarmst.demon.co.uk> Modifies behaviour of a failed dma write() operation for the yuv device. If the dma transfer for the yuv device fails, the write() operation will now exit immediately. Priority: normal Signed-off-by: Ian Armstrong <ian@iarmst.demon.co.uk> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-10-08Added support for Prof 7300 DVB-S/S2 cardsOleg Roitburd
From: Oleg Roitburd <oroitburd@gmail.com> Added support for Prof 7300 DVB-S/S2 card. The card based on cx24116 demodulator. Signed-off-by: Oleg Roitburd <oroitburd@gmail.com>
2008-10-04saa7134: fixes for the Asus Tiger Revision 1.00Mauro Carvalho Chehab
From: Hermann Pitton <hermann-pitton@arcor.de> In opposite to the P7131 Dual this early OEM card has a male radio antenna connector and also no remote. We currently switch the DVB-T RF feed to the radio input, like on the P7131 with female radio connector used also for DVB-T and should improve this. Priority: normal Signed-off-by: Hermann Pitton <hermann-pitton@arcor.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2008-10-04merge: http://linuxtv.org/hg/~awalls/cx18-mmio-fixesMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2008-10-04merge: http://linuxtv.org/hg/~dougsland/em28xx-hvrMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2008-10-04merge: http://linuxtv.org/hg/~dougsland/em28xx-310uMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2008-10-04Whitespace cleanupsMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2008-10-04gspca: Adjust control values and restore compilation of sonixj.Mauro Carvalho Chehab
From: Jean-Francois Moine <moinejf@free.fr> - no compilation since last changeset - brightness is a signed value - better values of the color matrix Priority: normal Signed-off-by: Jean-Francois Moine <moinejf@free.fr> [mchehab@redhat.com: fix a merge conflict] Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-10-03gspca: Subdriver selection at config time.Jean-Francois Moine
From: Erik Andren <erik.andren@gmail.com> Priority: normal Signed-off-by: Erik Andren <erik.andren@gmail.com> Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-10-03gspca: Moves some sensor initialization to each sensor in m5602.Jean-Francois Moine
From: Erik Andren <erik.andren@gmail.com> Priority: normal Signed-off-by: Erik Andren <erik.andren@gmail.com> Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-10-03cx18: Up the version to 1.0.1Andy Walls
From: Andy Walls <awalls@radix.net> cx18: Up the version to 1.0.1. This will make it easy to tell if retries of MMIO access are implemented or not in trouble reports. First course of action for I2C and other initialization problem reports will be to have user upgrade to v1.0.1 of driver. Priority: high Signed-off-by: Andy Walls <awalls@radix.net>
2008-10-03gspca: Frame counter in ALi m5602.Jean-Francois Moine
From: Erik Andren <erik.andren@gmail.com> Priority: normal Signed-off-by: Erik Andren <erik.andren@gmail.com> Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-10-03gspca: Cleanup code and small changes.Jean-Francois Moine
From: Erik Andren <erik.andren@gmail.com> - convert some #define to enum. - remove some comments. - return ENOMEM on memory allocation failure. Priority: normal Signed-off-by: Erik Andren <erik.andren@gmail.com> Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-10-02gspca: Bad init values for sonixj ov7660.Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> Priority: high Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-10-01gspca: Subdriver m5602 (ALi) added.Jean-Francois Moine
From: Erik Andren <erik.andren@gmail.com> This patch adds support for the ALi m5602 usb bridge and is based on the gspca framework. It contains code for communicating with 5 different sensors: OmniVision OV9650, Pixel Plus PO1030, Samsung S5K83A, S5K4AA and finally Micron MT9M111. Priority: high Signed-off-by: Erik Andren <erik.andren@gmail.com> Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-09-30gspca: Restart the state machine when no frame buffer in finepix.Jean-Francois Moine
From: Frank Zago <frank@zago.net> Priority: normal Signed-off-by: Frank Zago <frank@zago.net> Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-09-30em28xx: Add detection for K-WORLD DVB-T 310UDouglas Schilling Landgraf
From: Darron Broad <darron@kewl.org> Correct firmware type to MTS Correct audio routing for composite/s-video Add DVB-T detection. This patch uses the eeprom hash method for detection as the vendor/product ids are also used for the DIGIVOX_AD. This may be a clone of the same product. Explanatory text has been added prior to the hask look-up in anticipation that it may help others. The following has been tested to work: Analogue TV (PAL-I) Composite In DVB-T (UK Crystal Palace) USB AUDIO The following has not been tested but probably works: S-Video In Priority: high Signed-off-by: Darron Broad <darron@kewl.org> Signed-off-by: Douglas Schilling Landgraf <dougsland@linuxtv.org>
2008-10-01merge: http://www.linuxtv.org/hg/~stoth/s2Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2008-09-29gspca: Remove the duplicated EOF (ff d9) in t613.Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> Priority: normal Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-09-29gspca: New subdriver 'finepix' added.Jean-Francois Moine
From: Frank Zago <frank@zago.net> Priority: normal Signed-off-by: Frank Zago <frank@zago.net> Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-09-29gspca: Image transfer by bulk uses altsetting 0 with any buffer size.Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> - gspca_dev field 'bulk_size' added. - when only one altsetting usable, do image transfer by bulk. Priority: normal Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-09-28cx18: Add default behavior of checking and retrying PCI MMIO accessesAndy Walls
From: Andy Walls <awalls@radix.net> cx18: Add default behavior of checking and retrying PCI MMIO accesses. The concept of checking and retrying PCI MMIO accesses for better reliability in older motherboards was suggested by Steve Toth <stoth@linuxtv.org>. This change implements MMIO retries and the retry_mmio module parameter that is enabled by default. Limited experiments have shown this is more reliable than the mmio_ndelay parameter. mmio_ndelay has insignificant effect with retries enabled. Priority: high Signed-off-by: Andy Walls <awalls@radix.net>
2008-09-28gspca: Use a kref to avoid potentialy blocking forever in disconnect.Jean-Francois Moine
From: Frank Zago <frank@zago.net> Priority: normal Signed-off-by: Frank Zago <frank@zago.net> Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-09-28gspca: URB_NO_TRANSFER_DMA_MAP is required for isoc and bulk transfers.Jean-Francois Moine
From: Frank Zago <frank@zago.net> Priority: normal Signed-off-by: Frank Zago <frank@zago.net> Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-09-28em28xx: HVR-900 B3C0 - fix audio clicking issueDouglas Schilling Landgraf
From: Wiktor Grebla <greblus@gmail.com> Fixed audio clicking problem which could be heard when using analog tv or composite input Priority: high Signed-off-by: Wiktor Grebla <greblus@gmail.com> Signed-off-by: Douglas Schilling Landgraf <dougsland@linuxtv.org>
2008-09-29saa7134: fix I2C remote controls on saa7134Mauro Carvalho Chehab
From: Dmitri Belimov <d.belimov@gmail.com> This is patch for solve this regression. Load ir-kbd-i2c module when remote is i2c type. With my best regards, Dmitry. Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov <d.belimov@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2008-09-26gspca: Fixed a few typos in comments.Jean-Francois Moine
From: Frank Zago <frank@zago.net> Priority: normal Signed-off-by: Frank Zago <frank@zago.net> Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-09-26gspca: URB_NO_TRANSFER_DMA_MAP is not useful for isoc transfers.Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> Priority: normal Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-09-25cx88: Bugfix: all client disconnects put the frontend to sleep.Steven Toth
From: Darron Broad <darron@kewl.org> From the author: "This fixes the problem where previously all client disconnects put the analogue frontend into standby. In the following example, the first command is succesfully watching TV but the second command which returns EBUSY detunes the receiver by entering it into the standby state. tvtime -d /dev/video0 & cat /dev/video0 " Priority: normal Signed-off-by: Steven Toth <stoth@linuxtv.org> Signed-off-by: Darron Broad <darron@kewl.org>
2008-09-23fix buffer overflow in uvc-videoMauro Carvalho Chehab
From: Ralph Loader <suckfish@ihug.co.nz> There is a buffer overflow in drivers/media/video/uvc/uvc_ctrl.c: INFO: 0xf2c5ce08-0xf2c5ce0b. First byte 0xa1 instead of 0xcc INFO: Allocated in uvc_query_v4l2_ctrl+0x3c/0x239 [uvcvideo] age=13 cpu=1 pid=4975 ... A fixed size 8-byte buffer is allocated, and a variable size field is read into it; there is no particular bound on the size of the field (it is dependent on hardware and configuration) and it can overflow [also verified by inserting printk's.] The patch attempts to size the buffer to the correctly. Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Acked-by: Laurent Pinchart <laurent.pinchart@skynet.be> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2008-09-28merge: http://linuxtv.org/hg/~pb/v4l-dvb/Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>