summaryrefslogtreecommitdiff
path: root/drivers/media/video
AgeCommit message (Collapse)Author
2011-01-10merging android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36Nitin Kumbhar
Conflicts: arch/arm/mach-tegra/fuse.c drivers/misc/Makefile Change-Id: I300b925d78b31efe00c342190d8dbd50e2e81230
2011-01-07Merge commit 'v2.6.36.3' into linux-tegra-2.6.36Colin Cross
2011-01-07gspca - sonixj: Add a flag in the driver_info tableJean-Francois Moine
commit c6c14330717f9850b4b4c054b81424b9979cd07d upstream. Signed-off-by: Jean-François Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-07gspca - sonixj: Set the flag for some devicesJean-Francois Moine
commit b2272a49e7df37732d73988f00468ce31e1ebc92 upstream. The flag PDN_INV indicates that the sensor pin S_PWR_DN has not the same value as other webcams with the same sensor. For now, only two webcams have been so detected: the Microsoft's VX1000 and VX3000. Signed-off-by: Jean-François Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-07mx2_camera: fix pixel clock polarity configurationBaruch Siach
commit 42cc37fe20cc680fb58fe12ae5ba718d683b8ca2 upstream. When SOCAM_PCLK_SAMPLE_FALLING, just leave CSICR1_REDGE unset, otherwise we get the inverted behaviour. Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-24Allow AVP to have multiple clients.Chong Zhang
Ref-count the AVP open/release requests; if AVP already opened, just inc the refcount and let the request succeed. bug 772210 Change-Id: I061e02e4c82fc6915ed5b73a536a7707d5c055db Reviewed-on: http://git-master/r/13661 Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Tested-by: Bharat Nihalani <bnihalani@nvidia.com>
2010-12-23merging android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36Nitin Kumbhar
Conflicts: arch/arm/mach-tegra/board-ventana-power.c drivers/mfd/tps6586x.c Change-Id: Ic8c46d4251d6e71fa2900b7e876f87e256299bc4
2010-12-21Merge commit 'v2.6.36.2' into linux-tegra-2.6.36Colin Cross
2010-12-14[misc] cancel executable permission on source filesChao Jiang
Source files should not be with executable permission. Change-Id: I70b6be4cf88fea4be9b092ca2f5dd08e40ee7cbd Reviewed-on: http://git-master/r/12081 Reviewed-by: Chao Jiang <chaoj@nvidia.com> Tested-by: Chao Jiang <chaoj@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2010-12-10merging android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36Nitin Kumbhar
Change-Id: I1312ec33ba8bac38dc395d7d1a2f485b13d74c14
2010-12-09msp3400: fix mute audio regressionHans Verkuil
commit 0310871d8f71da4ad8643687fbc40f219a0dac4d upstream. The switch to the new control framework caused a regression where the audio was no longer unmuted after the carrier scan finished. The original code attempted to set the volume control to its current value in order to have the set-volume control code to be called that handles the volume and muting. However, the framework will not call that code unless the new volume value is different from the old. Instead we now call msp_s_ctrl directly. It is a bit of a hack: we really need a v4l2_ctrl_refresh_ctrl function for this (or something along those lines). Thanks to Andy Walls for bisecting this and to Shane Shrybman for reporting it! Reported-by: Shane Shrybman <shrybman@teksavvy.com> Thanks-to: Andy Walls <awalls@md.metrocast.net> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-09saa7134: Fix autodetect for Behold A7 and H7 TV cardsDmitri Belimov
commit 35bbe587d0959712b69540077c9e0fd27d3e6baf upstream. The entries for those cards are after the generic entries, so they don't work, in practice. Moving them to happen before the generic entres fix the issue. Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov <d.belimov@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-09drivers/media/video/cx23885/cx23885-core.c: fix cx23885_dev_checkrevision()Andrew Morton
commit abe1def46d84aa27d3f84d729204b162e8c64d76 upstream. It was missing the `break'. Addresses https://bugzilla.kernel.org/show_bug.cgi?id=18672 Reported-by: Igor <i2g2r2@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-09hdpvr: Add missing URB_NO_TRANSFER_DMA_MAP flagJames M McLaren
commit 4f5c933abb34532dc962185c999509b97a97fa1b upstream. Necessary on arm. Signed-off-by: Janne Grunau <j@jannau.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-09gspca - sonixj: Fix a regression of sensors hv7131r and mi0360Jean-François Moine
commit 0303a90a744662e934877a5d637a43197229274b upstream. The bug was introduced by commit 23a98274cc348880ecb6803307c254448084953a applying values of sensor sp80708 to sensors hv7131r and mi0360. Signed-off-by: Jean-François Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-09gspca - main: Fix a regression with the PS3 Eye webcamJean-François Moine
commit f43402fa55bf5e7e190c176343015122f694857c upstream. When audio is present, some alternate settings were skipped. This prevented some webcams to work, especially when bulk transfer was used. This patch permits to use the last or only alternate setting. Reported-by: Antonio Ospite <ospite@studenti.unina.it> Tested-by: Antonio Ospite <ospite@studenti.unina.it> Signed-off-by: Jean-François Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-08media: video: tegra: avp_svc: Force memory bus to full when avp is enabledColin Cross
Change-Id: I51382f58f296df939f99d60926ba97f0b4e04aed Signed-off-by: Colin Cross <ccross@android.com>
2010-12-03merging android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36Nitin Kumbhar
Change-Id: I7299b3bed83fbf41f5666724e328980cfcda1186
2010-11-30media: video: tegra: avp: turn off chatty avp/rpc debug loggingDima Zavin
Change-Id: I3f9025285fc5a002dbd436ee76bb6ca757c425ea Signed-off-by: Dima Zavin <dima@android.com>
2010-11-30media: video: tegra: avp: make avp_svc have separate debug maskDima Zavin
Change-Id: Ib5490a7f7d294760d34a3b9da14281ad96c9b26c Signed-off-by: Dima Zavin <dima@android.com>
2010-11-30media: video: tegra: properly drop refs to sclk on cleanupDima Zavin
Change-Id: I7af31dc4cd1e2d7a4142f6265665a05ca4f41d15 Signed-off-by: Dima Zavin <dima@android.com>
2010-11-21camera: add driver for ov5650Pritesh Raithatha
Change-Id: I127ea2a132adf2126c28194e8d778cc46b0a2e63 Reviewed-on: http://git-master/r/10573 Reviewed-by: Chien-Yu Chen <chichen@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Tested-by: Bharat Nihalani <bnihalani@nvidia.com>
2010-11-16merging android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36Nitin Kumbhar
Change-Id: I8f323ecc04e0ccefa31d6533b58b7878675bf8c9
2010-11-11Merge branch android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36Nitin Kumbhar
Change-Id: I7dbc97aee0c0912baf4722a8756d228bf7dd1212
2010-11-10media: tegra: avp: fix a mutex leak on an err path in lib loadDima Zavin
Also hold the mutex for longer on cleanup, while deleting the libs nvmap client. Not strictly necessary... Change-Id: I4dfdb065211571338053a16bacc2e5412c26ae77 Signed-off-by: Dima Zavin <dima@android.com>
2010-11-09media: video: tegra: add avp port transport info to debug dumpDima Zavin
Change-Id: I7ade4469609ecf87663e6a6733842889b27f7ce5 Signed-off-by: Dima Zavin <dima@android.com>
2010-11-09media: video: tegra: add debugfs entry for tegra_rpcDima Zavin
For now just includes the existing ports, the peer owners, and the port and peer state. Change-Id: I2c6b603ca02dc48acc1c763380ff0f1cb66f482b Signed-off-by: Dima Zavin <dima@android.com>
2010-11-09media: video: tegra: wait for remote ack on disconnectDima Zavin
Change-Id: I42bf507b7d644184bd27be6ff53e5974dcfa3797 Signed-off-by: Dima Zavin <dima@android.com>
2010-11-08media: video: tegra: add ref count for remote clock requestsDima Zavin
Change-Id: I824f9a27bfefe86211bc71d5f79ea798052b98b7 Signed-off-by: Dima Zavin <dima@android.com>
2010-11-07media: video: tegra: add support for the AVP media offload engineDima Zavin
Change-Id: Ia72e022ad1217ffe75915465ca0e886b16d1a64a Signed-off-by: Dima Zavin <dima@android.com>
2010-11-07media: video: tegra: Add Tegra RPC support for tegra multimedia frameworkDima Zavin
Change-Id: I9233c5d7c678f6a9ba1c23af686137bf4d6a4291 Signed-off-by: Dima Zavin <dima@android.com>
2010-11-02media: video: tegra: add basic camera/isp supportRebecca Schultz Zavin
The tegra_camera device includes all clock and regulator functionality needed to support camera on tegra. Change-Id: I281f1cb5f360276af832309e35dbe17c98b62bb3 Signed-off-by: Dima Zavin <dima@android.com>
2010-10-22Merge remote branch 'android-tegra-2.6.36'Dan Willemsen
Change-Id: Idabf0fb5eed1dee0d1329c6588524ab828c278ab
2010-10-19Merge remote branch 'android-tegra-2.6.36'Dan Willemsen
Conflicts: arch/arm/configs/tegra_defconfig arch/arm/mach-tegra/tegra_i2s_audio.c Change-Id: Ib0d7fc5c84b21a58f78a4a987c245e0e110ff437
2010-10-19media: video: move tegra/tegra_camera.c to unlocked_ioctlErik Gilling
Change-Id: I2b12aaf72ac0303725aa9b419cd7240e1a198fd8
2010-10-15v4l1: fix 32-bit compat microcode loading translationLinus Torvalds
The compat code for the VIDIOCSMICROCODE ioctl is totally buggered. It's only used by the VIDEO_STRADIS driver, and that one is scheduled to staging and eventually removed unless somebody steps up to maintain it (at which point it should use request_firmware() rather than some magic ioctl). So we'll get rid of it eventually. But in the meantime, the compatibility ioctl code is broken, and this tries to get it to at least limp along (even if Mauro suggested just deleting it entirely, which may be the right thing to do - I don't think the compatibility translation code has ever worked unless you were very lucky). Reported-by: Kees Cook <kees.cook@canonical.com> Cc: Mauro Carvalho Chehab <mchehab@infradead.org> Cc: stable@kernel.org Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2010-10-13media: video: tegra_camera: Change value written into clock register for viRebecca Schultz Zavin
Change-Id: I5e4d4a14f055ea8a19f715f8bf8fb3d7b88b7cda Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
2010-10-13media: video: tegra: Move tegra_isp to tegra_camera and add functionalityRebecca Schultz Zavin
The tegra_camera device has been extended to include all clock and regulator functionality needed by to support camera on tegra. Change-Id: Ie1611a79c24f7ebe3ae570d38a9f470683af91dd Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
2010-10-13media: video: Add stub isp driver for tegraRebecca Schultz Zavin
Change-Id: I6ff1bf0e72ef69b59d5875bd60c7cd825fa2ca4f Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
2010-09-30V4L/DVB: v4l: videobuf: prevent passing a NULL to dma_free_coherent()Pawel Osciak
When a driver that uses videobuf-dma-contig is used with the USERPTR memory access method a kernel oops might happen: a NULL address may be passed to dma_free_coherent(). This happens when an application calls REQBUFS and then exits without queuing any buffers. This patch fixes that bug. Signed-off-by: Pawel Osciak <p.osciak@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-09-27V4L/DVB: v4l: s5p-fimc: Fix 3-planar formats handling and pixel offset error ↵Sylwester Nawrocki
on S5PV210 SoCs Fix DMA engine pixel offset calculation for 3-planar YUV formats. On S5PV210 SoCs horizontal offset is applied as number of pixels, not bytes per line. [mchehab@redhat.com: CodingStyle cleanup] Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-09-27V4L/DVB: v4l: s5p-fimc: Fix return value on probe() failurePawel Osciak
On failed create_workqueue() fimc_probe() was returning 0. Signed-off-by: Pawel Osciak <p.osciak@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-09-27V4L/DVB: uvcvideo: Restrict frame rates for Chicony CNF7129 webcamLaurent Pinchart
At all frame rates except 30fps and 5fps the camera produces very dark pictures. Auto-exposure is probably disabled by the camera at all frame rates except 30fps, making them pretty unusable. Work around the problem by introducing a new RESTRICT_FRAME_RATE quirk that disables all the frame rates except the default one. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-09-27V4L/DVB: uvcvideo: Fix support for Medion Akoya All-in-one PC integrated webcamLaurent Pinchart
The camera requires the STREAM_NO_FID quirk. Add a corresponding entry in the device IDs list. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-09-27V4L/DVB: ivtvfb: prevent reading uninitialized stack memoryDan Rosenberg
The FBIOGET_VBLANK device ioctl allows unprivileged users to read 16 bytes of uninitialized stack memory, because the "reserved" member of the fb_vblank struct declared on the stack is not altered or zeroed before being copied back to the user. This patch takes care of it. Signed-off-by: Dan Rosenberg <dan.j.rosenberg@gmail.com> Signed-off-by: Andy Walls <awalls@md.metrocast.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-09-27V4L/DVB: cx25840: Fix typo in volume control initialization: 65335 vs. 65535Andy Walls
The wrong value for the volume control limit, 65335 vs. 65535, prevents proper cx25840 v4l2_subdevice initialization. Reported-by: Igor M. liplianin <liplianin@me.by> Signed-off-by: Andy Walls <awalls@md.metrocast.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-09-27V4L/DVB: v4l: mem2mem_testdev: add missing release for video_devicePawel Osciak
Video device was not being released on driver remove. Signed-off-by: Pawel Osciak <p.osciak@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-09-27V4L/DVB: v4l: mem2mem_testdev: fix errorenous comparisonPawel Osciak
Output buffer has to be at least the size of input buffer, not the other way around. Signed-off-by: Pawel Osciak <p.osciak@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-09-27V4L/DVB: mt9v022.c: Fixed compilation warningIonut Gabriel Popescu
The drivers/media/video/mt9v022.c file, on line 405, tries a "case 0" o a v4l2_mbus_pixelcode enum which don't have an 0 value element, so I got a compile warning. That "case" is useless so it can be removed. Signed-off-by: Ionut Gabriel Popescu <poyo_vl@yahoo.com> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-09-27V4L/DVB: mt9m111: added current colorspace at g_fmtMichael Grzeschik
Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
generated by cgit v1.2.3 (git 2.0.4) at 2024-06-14 02:35:24 +0000