summaryrefslogtreecommitdiff
path: root/drivers/media/video
AgeCommit message (Collapse)AuthorFilesLines
2011-10-15[media] cx23885: Avoid stopping the risc engine during buffer timeoutSteven Toth1-4/+0
1. Removed the verbose 'dump channel state to console', very noisy in weak signal conditions. 2. No need for the video buffer timeout to stop the risc engine here. Clearer and easier to maintain if start_video_dma() is the single place that this is done. Signed-off-by: Steven Toth <stoth@kernellabs.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-10-15[media] cx23885: Removed a spurious function cx23885_set_scale()Steven Toth1-8/+0
Unused function removed. Signed-off-by: Steven Toth <stoth@kernellabs.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-10-15[media] cx23885: v4l2 api compliance, set the audioset field correctlySteven Toth1-0/+5
Inform applications that multiple audio inputs are available on non-tv inputs. Signed-off-by: Steven Toth <stoth@kernellabs.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-10-15[media] cx23885: hook the audio selection functions into the main driverSteven Toth1-15/+25
Ensure audio is established at driver start. Ensure the correct defaults are established for the audio path if the cards struct has nothing defined. Allow the caller to select one of the two baseband input paths. Signed-off-by: Steven Toth <stoth@kernellabs.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-10-15[media] cx23885: add generic functions for dealing with audio input selectionSteven Toth2-0/+82
Signed-off-by: Steven Toth <stoth@kernellabs.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-10-15[media] cx23885: fixes related to maximum number of inputs and range checkingSteven Toth1-2/+5
Signed-off-by: Steven Toth <stoth@kernellabs.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-10-15[media] cx23885: Initial support for the MPX-885 mini-cardSteven Toth3-1/+29
Signed-off-by: Steven Toth <stoth@kernellabs.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-10-15[media] cx25840: Ensure AUDIO6 and AUDIO7 trigger line-in baseband useSteven Toth1-1/+2
Signed-off-by: Steven Toth <stoth@kernellabs.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-10-15[media] cx23885: Enable audio line in support from the back panelSteven Toth2-0/+79
Add code to program the flatiron internal i2c ADC and pass the appropriate audio mux enums to the cx25840 driver. Signed-off-by: Steven Toth <stoth@kernellabs.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-10-15[media] cx23885: Allow the audio mux config to be specified on a per input basisSteven Toth1-0/+1
Signed-off-by: Steven Toth <stoth@kernellabs.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-10-15[media] cx25840: Enable support for non-tuner LR1/LR2 audio inputsSteven Toth2-1/+20
The change effects cx23885 boards only and preserves support for existing boards. Essentially, if we're using baseband audio into the cx23885 AV core then we have to patch registers. The cx23885 driver will call with either CX25840_AUDIO8 to signify tuner audio or AUDIO7 to signify baseband audio. If/When we become more comfortable with this change across a series of products then we may decide to relax the cx23885 only restriction. [liplianin@netup.ru: fix missing state declaration] Signed-off-by: Steven Toth <stoth@kernellabs.com> Signed-off-by: Igor M. Liplianin <liplianin@netup.ru> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-10-15[media] cx23885: Name an internal i2c part and declare a bitfield by nameSteven Toth2-0/+2
Signed-off-by: Steven Toth <stoth@kernellabs.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-10-15[media] cx23885: Ensure VBI buffers timeout quickly - bugfix for vbi hangs ↵Steven Toth1-2/+2
during streaming Signed-off-by: Steven Toth <stoth@kernellabs.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-10-15[media] cx23885: remove channel dump diagnostics when a vbi buffer times outSteven Toth1-2/+0
Signed-off-by: Steven Toth <stoth@kernellabs.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-10-15[media] cx23885: ensure video is streaming before allowing vbi to streamSteven Toth1-0/+8
Signed-off-by: Steven Toth <stoth@kernellabs.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-10-15[media] cx23885: Ensure the VBI pixel format is established correctlySteven Toth1-3/+25
Signed-off-by: Steven Toth <stoth@kernellabs.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-10-15[media] cx23885: add vbi buffer formatting, window changes and video core ↵Steven Toth4-6/+62
changes Signed-off-by: Steven Toth <stoth@kernellabs.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-10-15[media] cx23885: vbi line window adjustmentsSteven Toth1-3/+16
Coding style and printk's cleaned up in following patches. Signed-off-by: Steven Toth <stoth@kernellabs.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-10-15[media] cx25840: enable raw cc processing only for the cx23885 hardwareSteven Toth1-0/+7
This change is probably good for other boards also, but the change has limited scope and is reasonably safe. Signed-off-by: Steven Toth <stoth@kernellabs.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-10-15[media] cx23885: minor printk cleanups and device registrationSteven Toth1-1/+14
Signed-off-by: Steven Toth <stoth@kernellabs.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-10-15[media] cx23885: initialize VBI support in the core, add IRQ support, ↵Steven Toth1-13/+55
register vbi device Coding style and printk's are cleaned up in subsequent patches Signed-off-by: Steven Toth <stoth@kernellabs.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-10-15[media] cx23885: initial support for VBI with the cx23885Steven Toth4-6/+47
A handlful of coding style issue cleaned up in the following patches. Signed-off-by: Steven Toth <stoth@kernellabs.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-10-15[media] cx23885: add two additional defines to simplify VBI register bitmap ↵Steven Toth1-0/+2
handling Signed-off-by: Steven Toth <stoth@kernellabs.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-10-15[media] cx23885: setup the dma mapping for raw audio supportSteven Toth1-1/+0
Signed-off-by: Steven Toth <stoth@kernellabs.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-10-15[media] cx23885: minor function renaming to ensure uniformitySteven Toth3-6/+7
Signed-off-by: Steven Toth <stoth@kernellabs.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-10-15[media] cx23885: convert call clients into subdevicesSteven Toth1-0/+2
Signed-off-by: Steven Toth <stoth@kernellabs.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-10-15[media] cx23885: Don't use memset on vidioc_ callbacksMauro Carvalho Chehab1-1/+0
vidioc_g_tuner should not do any memset for the parameters. Core already does that. In particular, V4L2 core now does some handling for the tuner type, and the tuner-core module relies on that. So, doing any memset there is a very bad idea. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-10-14[media] cx23885: hooks the alsa changes into the video subsystemMijhail Moreyra1-7/+16
Signed-off-by: Mijhail Moreyra <mijhail.moreyra@gmail.com> Signed-off-by: Steven Toth <stoth@kernellabs.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-10-14[media] cx23885: correct the contrast, saturation and hue controlsMijhail Moreyra1-6/+6
Signed-off-by: Mijhail Moreyra <mijhail.moreyra@gmail.com> Signed-off-by: Steven Toth <stoth@kernellabs.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-10-14[media] cx23885: add definitions for HVR1500 to support audioMijhail Moreyra1-0/+24
Signed-off-by: Mijhail Moreyra <mijhail.moreyra@gmail.com> Signed-off-by: Steven Toth <stoth@kernellabs.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-10-14[media] cx23885: Add ALSA supportMijhail Moreyra4-16/+611
[stoth@kernellabs.com: add it to the makefile and fix snd_card binding] [liplianin@netup.ru: videobuf: Remove the videobuf_sg_dma_map/unmap functions] Signed-off-by: Mijhail Moreyra <mijhail.moreyra@gmail.com> Signed-off-by: Steven Toth <stoth@kernellabs.com> Signed-off-by: Igor M. Liplianin <liplianin@netup.ru> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-10-08[media] tvp5150: Add video format registers configuration valuesJavier Martinez Canillas1-1/+16
The tvp5150 video decoder has two operation modes to configure the video standard used. If auto-switch mode is enable, the device can sense the signal and detect which video standard the device is operating. Also the device can be forced to use a user defined video standard. Each operation mode uses a different register and the bitmask values to represent each standard is different. So we add video standard constants for both autoswitch and no-autoswitch mode. Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-10-08[media] drivers/media: fix dependencies in video mt9t001/mt9p031Paul Gortmaker3-2/+4
Both mt9t001.c and mt9p031.c have two identical issues, those being that they will need module.h inclusion for the upcoming cleanup going on there, and that their dependencies don't limit selection of configs that will fail to compile as follows: The related config options are CONFIG_MEDIA_CONTROLLER and CONFIG_VIDEO_V4L2_SUBDEV_API. Looking at the code, it appears that the driver was never intended to work without these enabled, so add a dependency on CONFIG_VIDEO_V4L2_SUBDEV_API, which in turn already has a dependency on CONFIG_MEDIA_CONTROLLER. Reported-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Acked-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-10-08[media] em28xx: Add VIDIOC_QUERYSTD supportMauro Carvalho Chehab1-0/+16
Allow subdevs to return the detected standards Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-10-08[media] msp3400: Add standards detection to the driverMauro Carvalho Chehab3-23/+85
As msp3400 allows standards detection, add support for it. That efectivelly means that devices with msp3400 can now implement VIDIOC_QUERYSTD, and it will provide very good detection for the standard, specially if combined with a video decoder detection. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-10-08[media] pvrusb2: initialize standards mask before detecting standardMauro Carvalho Chehab1-0/+1
Acked-by: Mike Isely <isely@pobox.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-10-08[media] saa7115: Trust that V4L2 core will fill the maskMauro Carvalho Chehab1-7/+12
Instead of using V4L2_STD_ALL when no standard is detected, trust that the maximum allowed standards are already filled by the V4L2 core. It is better this way, as the bridge and/or the audio decoder may have some extra restrictions to some video standards. This also allow other devices like audio and tuners to contribute to standards detection, when they support such feature. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-10-08[media] v4l2-ioctl: Fill the default value for VIDIOC_QUERYSTDMauro Carvalho Chehab1-0/+8
According with the V4L2 API spec: "When detection is not possible or fails, the set must contain all standards supported by the current video input or output." The V4L2 core has the mask with all supported standards already. So, apply it. Driver and subdevs can then just remove standards from the mask, as they're able of detecting audio, video and frames frequency. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-10-08[media] pvrusb2: implement VIDIOC_QUERYSTDMauro Carvalho Chehab3-0/+17
Acked-by: Mike Isely <isely@pobox.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-10-08[media] saa7115: Fix standards detectionMauro Carvalho Chehab1-14/+31
There are several bugs at saa7115 standards detection: After the fix, the driver is returning the proper standards, as tested with 3 different broadcast sources: On an invalid channel (without any TV signal): [ 4394.931630] saa7115 15-0021: Status byte 2 (0x1f)=0xe0 [ 4394.931635] saa7115 15-0021: detected std mask = 00ffffff With a PAL/M signal: [ 4410.836855] saa7115 15-0021: Status byte 2 (0x1f)=0xb1 [ 4410.837727] saa7115 15-0021: Status byte 1 (0x1e)=0x82 [ 4410.837731] saa7115 15-0021: detected std mask = 00000900 With a NTSC/M signal: [ 4422.383893] saa7115 15-0021: Status byte 2 (0x1f)=0xb1 [ 4422.384768] saa7115 15-0021: Status byte 1 (0x1e)=0x81 [ 4422.384772] saa7115 15-0021: detected std mask = 0000b000 Tests were done with a WinTV PVR USB2 Model 29xx card. Reviewed-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-09-26[media] v4l: mem2mem: add wait_{prepare,finish} ops to m2m_testdevMichael Olbrich1-0/+14
These are necessary to prevent dead-locks e.g. if one thread waits in dqbuf at one end and another tries to queue a buffer at the other end. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> Cc: Mauro Carvalho Chehab <mchehab@infradead.org> Cc: Pawel Osciak <pawel@osciak.com> Acked-by: Pawel Osciak <pawel@osciak.com> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-09-26[media] s5p-tv: fix mbus configurationTomasz Stanislawski4-2/+15
This patch fixes mbus configuration between Mixer, SDO and HDMI. The SDO accepts only YUV444 on input. The HDMI in DVI mode accepts only RGB888. Now Mixer is choosing proper output format depending on mbus format. Signed-off-by: Tomasz Stanislawski <t.stanislaws@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-09-26[media] s5p-tv: hdmi: use DVI modeTomasz Stanislawski2-7/+8
Current version of the driver does not support HDMI features not present in DVI standard. Therefore DVI mode is used to keep compatibility with DVI devices. Signed-off-by: Tomasz Stanislawski <t.stanislaws@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-09-26[media] s5p-tv: Add PM_RUNTIME dependencyHatim Ali1-1/+1
The TVOUT driver requires PM_RUNTIME support for proper clock enabling. Signed-off-by: Hatim Ali <hatim.rv@samsung.com> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-09-26[media] em28xx: replug locking cleanupChris Rankin1-4/+7
Simplifies the locking by moving the em28xx_init_extension() call until em28xx_usb_probe() has finished with the dev->lock mutex. It therefore makes the second and subsequent "plugging" events logically identical to the first "plugging" event when the em28xx-dvb and em28xx-alsa modules must be loaded (i.e. registered). Basically, em28xx_usb_probe() requests that em28xx-dvb be loaded and also triggers udev to initialise the V4L2 devices. These two events are serialised by the dev->lock mutex but the order that they happen in is undefined. But this has always been the case anyway. Signed-off-by: Chris Rankin <rankincj@yahoo.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-09-26[media] em28xx: remove unused prototypesChris Rankin1-2/+0
This patch just removes the prototypes for the two functions that I've already deleted in my previous patches. Signed-off-by: Chris Rankin <rankincj@yahoo.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-09-25[media] em28xx: fix deadlock when unplugging and replugging a DVB adapterChris Rankin1-2/+4
This fixes the deadlock that occurs with either multiple PCTV 290e adapters or when a single PCTV 290e adapter is replugged. For DVB devices, the device lock must now *not* be held when adding/removing either a device or an extension to the respective lists. (Because em28xx_init_dvb() will want to take the lock instead). Conversely, for Audio-Only devices, the device lock *must* be held when adding/removing either a device or an extension to the respective lists. Signed-off-by: Chris Rankin <rankincj@yahoo.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-09-24[media] em28xx: fix race on disconnectChris Rankin2-23/+8
This patch closes the race on the device and extension lists at USB disconnect time. Previously, the device was removed from the device list during em28xx_release_resources(), and then passed to the em28xx_close_extension() function so that all extensions could run their fini() operations. However, this left a (brief, theoretical, highly unlikely ;-)) window between these two calls during which a new module could call em28xx_register_extension(). The result would have been that the em28xx_usb_disconnect() function would also have passed the device to the new extension's fini() function, despite never having called the extension's init() function. This patch also restores em28xx_close_extension()'s symmetry with em28xx_init_extension(), and establishes the property that every device in the device list must have been initialised for every extension in the extension list. Signed-off-by: Chris Rankin <rankincj@yahoo.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-09-24[media] cx23885, cx25840: Provide IR Rx timeout event reportsAndy Walls2-8/+16
(Resending because Mauro reported losing some emails on IRC) Provide CX2388[578] IR receive timeout (RTO) reports in the final space raw event sent up the chain to the raw IR pulse decoders. This should allow the lirc decoder to actually measure the inter-transmission gap properly. Signed-off-by: Andy Walls <awalls@md.metrocast.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-09-24[media] m5mols: Remove superfluous irq field from the platform data structSylwester Nawrocki1-3/+3
There is no need to put the IRQ number in driver's private platform data structure as this can also be passed in struct i2c_lient.irq. Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>