aboutsummaryrefslogtreecommitdiff
path: root/include/media
AgeCommit message (Collapse)AuthorFilesLines
2008-05-20Fix a deadlock in the bttv driverArjan van de Ven1-0/+3
vidiocgmbuf() does this: mutex_lock(&fh->cap.vb_lock); retval = videobuf_mmap_setup(&fh->cap, gbuffers, gbufsize, V4L2_MEMORY_MMAP); and videobuf_mmap_setup() then just does mutex_lock(&q->vb_lock); ret = __videobuf_mmap_setup(q, bcount, bsize, memory); mutex_unlock(&q->vb_lock); which is an obvious double-take deadlock. This patch fixes this by having vidiocgmbuf() just call the __videobuf_mmap_setup function instead. Acked-by: Mauro Carvalho Chehab <[email protected]> Reported-by: Koos Vriezen <[email protected]> Signed-off-by: Arjan van de Ven <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-05-11i2c: Convert some more new-style drivers to use module aliasingJean Delvare2-0/+4
Update 3 more new-style i2c drivers to use standard module aliasing instead of the old driver_name/type driver matching scheme. These video drivers aren't used yet so converting them is trivial. Signed-off-by: Jean Delvare <[email protected]>
2008-04-29Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvbLinus Torvalds1-0/+1
* git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (28 commits) V4L-DVB(7789a): cx18: fix symbol conflict with ivtv driver V4L/DVB (7789): tuner: remove static dependencies on analog tuner sub-modules V4L/DVB (7785): [2.6 patch] make mt9{m001,v022}_controls[] static V4L/DVB (7786): cx18: new driver for the Conexant CX23418 MPEG encoder chip V4L/DVB (7783): drivers/media/dvb/frontends/s5h1420.c: printk fix V4L/DVB (7782): pvrusb2: Driver is no longer experimental V4L/DVB (7781): pvrusb2-dvb: include dvb support by default and update Kconfig help text V4L/DVB (7780): pvrusb2: always enable support for OnAir Creator / HDTV USB2 V4L/DVB (7779): pvrusb2-dvb: quiet down noise in kernel log for feed debug Rename common tuner Kconfig names to use the same Fix V4L/DVB core help messages V4L/DVB (7769): Move other terrestrial tuners to common/tuners V4L/DVB (7768): reorganize some DVB-S Kconfig items V4L/DVB(7767): Move tuners to common/tuners V4L/DVB (7766): saa7134: add another PCI ID for Beholder M6 V4L/DVB (7765): Add support for Beholder BeholdTV H6 V4L/DVB (7763): ivtv: add tuner support for the AverMedia M116 V4L/DVB (7762): ivtv: fix tuner detection for PAL-N/Nc V4L/DVB (7761): ivtv: increase the DMA timeout from 100 to 300 ms V4L/DVB (7759): ivtv: increase version number to 1.2.1 ...
2008-04-29V4L/DVB (7786): cx18: new driver for the Conexant CX23418 MPEG encoder chipHans Verkuil1-0/+1
Many thanks to Steve Toth from Hauppauge and Nattu Dakshinamurthy from Conexant for their support. I am in particular thankful to Hauppauge since without their help this driver would not exist. It should also be noted that Steve did the work to get the DVB part up and running. Thank you! Signed-off-by: Hans Verkuil <[email protected]> Signed-off-by: Steven Toth <[email protected]> Signed-off-by: Michael Krufky <[email protected]> Signed-off-by: G. Andrew Walls <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2008-04-29i2c: Add support for device alias namesJean Delvare3-3/+5
Based on earlier work by Jon Smirl and Jochen Friedrich. This patch allows new-style i2c chip drivers to have alias names using the official kernel aliasing system and MODULE_DEVICE_TABLE(). At this point, the old i2c driver binding scheme (driver_name/type) is still supported. Signed-off-by: Jean Delvare <[email protected]> Cc: Jochen Friedrich <[email protected]> Cc: Jon Smirl <[email protected]> Cc: Kay Sievers <[email protected]>
2008-04-24V4L/DVB (7677): saa7134: Add/fix Beholder entriesDmitry Belimov1-0/+1
Beholder TV/FM tuners: Changes: Add support Beholder Columbus PCMCIA card. Add key map for remote control of Beholder Columbus PCMCIA card. Fix gpiomask for all Beholder tuners. Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2008-04-24V4L/DVB (7665): videodev: Add default vidioc handlerDouglas Schilling Landgraf1-0/+4
Added default vidioc handler for other private ioctls Signed-off-by: Douglas Schilling Landgraf <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2008-04-24V4L/DVB (7566): videobuf-dvb: allow its usage with videobuf-vmallocMauro Carvalho Chehab2-8/+14
videobuf-dvb were still using a function that were videobuf-dma-sg dependent. This patch creates a generic handler for this function. This way, videobuf-dvb can now work with all videobuf implementations. Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2008-04-24V4L/DVB (7554): videobuf-dma-sg: Remove unused flagMauro Carvalho Chehab1-3/+0
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2008-04-24V4L/DVB (7538): Adds selectable adapter numbers as per module optionJanne Grunau1-1/+2
The adapter_nr module options can be used to allocate static adapter numbers on a driver level. It avoids problems with changing DVB apapter numbers after warm/cold boot or device unplugging and repluging. Each driver holds DVB_MAX_ADAPTER long array of the preferred order of adapter numbers. options dvb-usb-dib0700 adapter_nr=7,6,5,4,3,2,1,0 would result in a reversed allocation of adapter numbers. With adapter_nr=2,5 it tries first to get adapter number 2 and 5. If both are already in use it will allocate the lowest free adapter number. Signed-off-by: Janne Grunau <[email protected]> Acked-by: Hermann Pitton <[email protected]> Signed-off-by: Michael Krufky <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2008-04-24V4L/DVB (7506): Powercolor Real Angel 330 (remote control support)Dâniel Fraga1-0/+1
The attached patch adds complete remote control support for Powercolor Real Angel 330. Signed-off-by: Daniel Fraga <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2008-04-24V4L/DVB (7501): soc-camera: use a spinlock for videobuffer queueGuennadi Liakhovetski1-0/+3
All drivers should provide a spinlock to be used in videobuf operations. Signed-off-by: Guennadi Liakhovetski <[email protected]> Reviewed-by: Brandon Philips <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2008-04-24V4L/DVB (7500): soc-camera: extract function pointers from host object into ↵Guennadi Liakhovetski1-3/+6
operations Function pointers and the driver owner are not expected to change throughout soc-camera host's life. Extract them into an operations struct. Signed-off-by: Guennadi Liakhovetski <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2008-04-24V4L/DVB (7493): videobuf: Avoid deadlock with QBUF and bring up to spec for ↵Brandon Philips1-0/+2
empty queue Add a waitqueue to wait on when there are no buffers in the buffer queue. DQBUF waits on this queue without holding vb_lock to allow a QBUF to happen. Once a buffer has been queued we recheck that the queue is still streaming and wait on the new buffer's waitqueue while holding the vb_lock. The driver should come along in a timely manner and put the buffer into its next state finishing the DQBUF. By implementing this waitqueue it also brings the videobuf DQBUF up to spec and it now blocks on O_NONBLOCK even when no buffers have been queued via QBUF: "By default VIDIOC_DQBUF blocks when no buffer is in the outgoing queue." - V4L2 spec Signed-off-by: Brandon Philips <[email protected]> CC: Trent Piepho <[email protected]> CC: Carl Karsten <[email protected]> CC: Jonathan Corbet <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2008-04-24V4L/DVB (7406): soc-camera: improve separation between soc_camera_ops and ↵Guennadi Liakhovetski1-4/+4
soc_camera_device In case of muliple cameras, handled by the same driver, they can support Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2008-04-24V4L/DVB (7381): tuner: rename TUNER_PHILIPS_ATSC to TUNER_PHILIPS_FCV1236DMichael Krufky1-1/+1
TUNER_PHILIPS_ATSC is an ambiguous name for a tuner. Rename it to TUNER_PHILIPS_FCV1236D to be more descriptive. Signed-off-by: Michael Krufky <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2008-04-24V4L/DVB (7376): Improve compile-time type-checking in videobufGuennadi Liakhovetski1-2/+2
Make the dev member of the struct videobuf_queue of type "struct device *" to avoid future problems. Also change the prototype of the videobuf_queue_core_init() function. Signed-off-by: Guennadi Liakhovetski <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2008-04-24V4L/DVB (7372): cx88: Add IR support for Pixelview MPEG 8000GTMauro Carvalho Chehab1-0/+1
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2008-04-24V4L/DVB (7352): tuner-simple: enable digital tuning support for Philips ↵Michael Krufky1-1/+1
FMD1216ME Enable digital tuning support within tuner-simple. This will allow for a single tuner module to manage the hardware, without having dvb-pll loaded. Signed-off-by: Michael Krufky <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2008-04-24V4L/DVB (7351): tuner-simple: add init and sleep methodsMichael Krufky1-0/+3
taken from dvb-pll Signed-off-by: Michael Krufky <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2008-04-24V4L/DVB (7347): tuner-simple: add basic support for digital tuning of hybrid ↵Michael Krufky1-4/+10
devices Add entry points used for digital tuning via the dvb_frontend. Share state data between multiple instances of the driver for hybrid tuners. Signed-off-by: Michael Krufky <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2008-04-24V4L/DVB (7336): soc-camera: streamline hardware parameter negotiationGuennadi Liakhovetski1-14/+38
Improve hardware parameter negotiation between the camera host driver and camera drivers. Parameters like horizontal and vertical synchronisation, pixel clock polarity shall be set depending on capabilities of the parties. Signed-off-by: Guennadi Liakhovetski <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2008-04-24V4L/DVB (7276): soc-camera: deactivate cameras when not usedGuennadi Liakhovetski1-0/+2
Only attach cameras to the host interface for probing, then detach until open. This allows platforms with several cameras on an interface, physically supporting only one camera, to handle multiple cameras and activate them selectively after initial probing. The first attach during probe is needed to activate the host interface to be able to physically communicate with cameras. Signed-off-by: Guennadi Liakhovetski <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2008-04-24V4L/DVB (7237): Convert videobuf-dma-sg to generic DMA APIGuennadi Liakhovetski1-7/+7
videobuf-dma-sg does not need to depend on PCI. Switch it to using generic DMA API, convert all affected drivers, relax Kconfig restriction, improve compile-time type checking, fix some Coding Style violations while at it. Signed-off-by: Guennadi Liakhovetski <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2008-04-24V4L/DVB (7170): soc_camera V4L2 driver for directly-connected SoC-based camerasGuennadi Liakhovetski1-0/+147
This driver provides an interface between platform-specific camera busses and camera devices. It should be used if the camera is connected not over a "proper" bus like PCI or USB, but over a special bus, like, for example, the Quick Capture interface on PXA270 SoCs. Later it should also be used for i.MX31 SoCs from Freescale. It can handle multiple cameras and / or multiple busses, which can be used, e.g., in stereo-vision applications. Signed-off-by: Guennadi Liakhovetski <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2008-04-24V4L/DVB (7169): Add chip IDs for Micron mt9m001 and mt9v022 CMOS camerasGuennadi Liakhovetski1-0/+6
Add V4L2_IDENT chip IDs for mt9m001 and mt9v022 cameras, will be used by future patches, primarily to implement the g_chip_ident ioctl. Signed-off-by: Guennadi Liakhovetski <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2008-02-18V4L/DVB (7192): Adds support for Genius TVGo A11MCEAdrian Pardini1-0/+1
Signed-off-by: Adrian Pardini <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2008-02-18V4L/DVB (7150): [v4l] convert videbuf_vmalloc_memory to videobuf_vmalloc_memoryBrandon Philips1-1/+1
Signed-off-by: Brandon Philips <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2008-02-18V4L/DVB (7121): Renames videobuf lock to vb_lockMauro Carvalho Chehab1-1/+1
This helps to identify where vb_lock is being used, and find missusages of the locks. Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2008-02-18V4L/DVB (7133): Fix Kconfig dependenciesMauro Carvalho Chehab2-2/+2
As pointed by Adrian Bunk, with I2C=m and VIDEO_DEV=y, videodev brokes. This patch moves the functions that videodev needs from v4l2-common. It also fixes some Kconfig changes. After this patch, I2C=m / VIDEO_DEV=y will make v4l2 core statically linked into kernel. v4l2-common will be m, and all V4L drivers will also be m. This approach is very conservative, since it is possible to have V4L drivers that don't need I2C or v4l2-common. The better is to map what drivers really need v4l2-common, making them to select v4l2-common, and allowing the others to be 'y', 'm' and 'n'. Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2008-02-03include/media/: Spelling fixesJoe Perches1-1/+1
Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Adrian Bunk <[email protected]>
2008-01-27i2c: Constify client address dataMark M. Hoffman1-1/+1
This patch allows much of the I2C client address data to move from initdata into text. Signed-off-by: Mark M. Hoffman <[email protected]> Signed-off-by: Jean Delvare <[email protected]>
2008-01-25V4L/DVB (7058): IR corrections for the Pinnacle 800iSteven Toth1-0/+1
IR corrections for the Pinnacle 800i Signed-off-by: Steven Toth <[email protected]> Signed-off-by: Chaogui Zhang <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2008-01-25V4L/DVB (7042): xc5000: Tuner analog supportSteven Toth1-0/+1
From Zhang: This an updated patch that adds analog support for the xc5000 tuner driver. it was tested on a Pinnacle PCTV HD 800i card (patches to follow). Patch commited as-is, cleanup to follow ... Steve. Signed-off-by: Chaogui Zhang <[email protected]> Signed-off-by: Steven Toth <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2008-01-25V4L/DVB (7002): cx25840: Add basic CX23885 AVCore supportSteven Toth1-0/+19
The cx23885/7/8 PCIe bridge has an internal AVCore modelled on the cx2584x family. Many of the registers positions are identical but some moved. The register values are also different because the different bridges run at different clock rates. Signed-off-by: Steven Toth <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2008-01-25V4L/DVB (6997): Replace a very dirty hack on videobuf for a clean wait_eventMauro Carvalho Chehab1-0/+2
In order to videobuf_iolock to work, mmap_mapper should be called first. Otherwise, an OOPS is generated. On some cases, .mmap file handler used to took some time to be called. On those situations, mmap_mmapper() were called after iolock. This patch properly waits for mmap_mapper to be called, otherwise generating an error. Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2008-01-25V4L/DVB (6973): Add Beholder TV 401/405/407/409/505/507/609/M6 supportAndrey J. Melnikoff (TEMHOTA)1-0/+1
This patch updates cardlist for Beholder TV tuners: old models (with GPIO ir) 401, 403, 405, 407, 409, 505, 507 and add support for 607, 609, M6 cards with new i2c-ir. Signed-off-by: Igor Kuznetsov <[email protected]> Signed-off-by: Andrey J. Melnikov <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2008-01-25V4L/DVB (6921): include/media/v4l2-i2c-drv.h must #include <media/v4l2-common.h>Michael Krufky1-0/+7
Fix the following compiler error: v4l2-i2c-drv.h:72: error: implicit declaration of function 'v4l2_i2c_attach' Also, prevent multiple inclusions of v4l2-i2c-drv.h Signed-off-by: Michael Krufky <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2008-01-25V4L/DVB (6869): cs5345: new i2c driverHans Verkuil2-0/+42
Signed-off-by: Hans Verkuil <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2008-01-25V4L/DVB (6861): cx2341x: command argument should be u32 instead of intHans Verkuil1-1/+1
Signed-off-by: Hans Verkuil <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2008-01-25V4L/DVB (6785): tda8290: remove dependency on struct tunerMichael Krufky1-2/+0
- remove dependency of tda8290 module on struct tuner - move tuner_foo printk macros from tuner-driver.h into tuner-core.c - clean up #includes of tuner-i2c.h / tuner-driver.h Signed-off-by: Michael Krufky <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2008-01-25V4L/DVB (6766): ivtv: remove i2c legacy support from drivers that no longer ↵Hans Verkuil1-1/+0
need it Signed-off-by: Hans Verkuil <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2008-01-25V4L/DVB (6603): V4L: videobuf: convert streaming and reading to bitfieldsBrandon Philips1-2/+2
Signed-off-by: Brandon Philips <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2008-01-25V4L/DVB (6600): V4L: videobuf: don't chew up namespace STATE_.*, convert to ↵Brandon Philips1-7/+7
VIDEOBUF_ s/STATE_NEEDS_INIT/VIDEOBUF_NEEDS_INIT/g s/STATE_PREPARED/VIDEOBUF_PREPARED/g s/STATE_QUEUED/VIDEOBUF_QUEUED/g s/STATE_ACTIVE/VIDEOBUF_ACTIVE/g s/STATE_DONE/VIDEOBUF_DONE/g s/STATE_ERROR/VIDEOBUF_ERROR/g s/STATE_IDLE/VIDEOBUF_IDLE/g Signed-off-by: Brandon Philips <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2008-01-25V4L/DVB (6580): Set slave's master before master's attach call.Sakari Ailus1-3/+2
V4L: Int if: Set slave's master before attach, remove master argument The master also now gets its own pointer from slave's structure. Signed-off-by: Sakari Ailus <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2008-01-25V4L/DVB (6574): common/ir-functions.c: make a function staticAdrian Bunk1-1/+0
ir_rc5_decode() can become static. Signed-off-by: Adrian Bunk <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2008-01-25V4L/DVB (6496): saa7146_vv.h: remove wrong include <linux/videodev.h>Marco Schluessler1-1/+0
remove wrong include <linux/videodev.h> Signed-off-by: Marco Schluessler <[email protected]> Signed-off-by: Oliver Endriss <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2008-01-25V4L/DVB (6486): m52790: add new Mitsubishi A/V switch i2c driverHans Verkuil2-0/+96
This driver is used by the ASUS Falcon2 cx23416-based cards. Signed-off-by: Hans Verkuil <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2008-01-25V4L/DVB (6469): tuner: remove TUNER_PHILIPS_TDA8295Michael Krufky1-2/+0
TUNER_PHILIPS_TDA8290 will autodetect a TDA8290 or a TDA8295, so we don't need this separate entry anymore. Signed-off-by: Michael Krufky <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2008-01-25V4L/DVB (6466): v4l2-i2c-drv: first call remove, then detach clientHans Verkuil1-3/+5
The remove driver function expects that the client is still attached to the driver, so do the detach after calling remove(). Signed-off-by: Hans Verkuil <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.