[GIT PATCHES FOR 2.6.35] OMAP2/3 Bug Fixes
The following changes since commit 8310922e9b094c90665df0db6823172fbf053889: Mauro Carvalho Chehab (1): Merge tag 'v2.6.35-rc3' into devel/for_v2.6.35 are available in the git repository at: http://arago-project.org/git/people/?p=vaibhav/ti-psp-omap-video.git linux-media-devel-for_v2.6.35 Vaibhav Hiremath (3): OMAP_VOUT:Build FIX: Rebased against latest DSS2 changes OMAP_VOUT:FIX:Replaced dma-sg with dma-contig OMAP_VOUT:FIX: Module params were not working through bootargs drivers/media/video/omap/Kconfig |4 +- drivers/media/video/omap/Makefile|4 +- drivers/media/video/omap/omap_vout.c | 81 ++--- 3 files changed, 38 insertions(+), 51 deletions(-) Thanks, Vaibhav Hiremath -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT PATCHES FOR 2.6.35] mem2mem_testdev bugfix
The following changes since commit ed8c030bde28fc675aae7687a535436579298f06: stv090x: Fix merge conflict caused by changeset f2b3c6d2 (2010-06-01 18:13:26 -0300) are available in the git repository at: git://git.infradead.org/users/kmpark/linux-2.6-samsung v4l/fixes_for_v2.6.35 Pawel Osciak (1): v4l: mem2mem_testdev: fix g_fmt NULL pointer dereference drivers/media/video/mem2mem_testdev.c |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) This fixes a NULL-pointer dereference bug reported by Németh Márton. Best regards -- Pawel Osciak Linux Platform Group Samsung Poland R&D Center -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT PATCHES FOR 2.6.35] Updates for the uvcvideo driver
The following changes since commit 41c5f984b67b331064e69acc9fca5e99bf73d400:
Merge tag 'v2.6.35-rc2' into HEAD (2010-06-09 00:05:54 -0300)
are available in the git repository at:
git://linuxtv.org/pinchartl/uvcvideo.git uvcvideo-stable
Laurent Pinchart (1):
uvcvideo: Power line frequency control doesn't support GET_MIN/MAX/RES
drivers/media/video/uvc/uvc_ctrl.c |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
The change fixes the Apple iSight 2.6.34 -> 2.6.35-rc regression reported by
Johannes Berg on the linux-media mailing list ("macbook webcam no longer works
on .35-rc").
--
Regards,
Laurent Pinchart
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [GIT PATCHES FOR 2.6.35] forget gspca for_2.6.35
Em 11-06-2010 07:32, Jean-Francois Moine escreveu: > Hi Mauro, > > Please forget about the previous pull request: it seems that people > better like to have a monotonic time instead of the real wall time in > the video buffer timestamp. Yes. We should patch the other drivers to also use ktime, and update the specs. Cheers, Mauro. > > Thanks. > -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT PATCHES FOR 2.6.35] forget gspca for_2.6.35
Hi Mauro, Please forget about the previous pull request: it seems that people better like to have a monotonic time instead of the real wall time in the video buffer timestamp. Thanks. -- Ken ar c'hentañ | ** Breizh ha Linux atav! ** Jef | http://moinejf.free.fr/ -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [GIT PATCHES FOR 2.6.35] gspca for_2.6.35
On Thursday 10 June 2010 11:25:41 Paulo Assis wrote: > PLEASE NO, > The current use of ktime is much better, timestamps are perfectly in > sync and will not suffer from time shifts if the clock value changes. > > PLEASE just leave it like it is now. Agreed. The V4L2 spec should be modified. -- Regards, Laurent Pinchart -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [GIT PATCHES FOR 2.6.35] gspca for_2.6.35
PLEASE NO, The current use of ktime is much better, timestamps are perfectly in sync and will not suffer from time shifts if the clock value changes. PLEASE just leave it like it is now. Best Regards, Paulo 2010/6/10 Jean-Francois Moine : > Hi Mauro, > > The following changes since commit e411f2dda48c81c556c802d4430717950cf088fd: > > Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze > (2010-06-09 08:52:03 -0700) > > are available in the git repository at: > > git://linuxtv.org/jfrancois/gspca.git for_2.6.35 > > Jean-François Moine (1): > gspca - main: Set the wall time as buffer timestamp. > > drivers/media/video/gspca/gspca.c | 15 --- > 1 files changed, 12 insertions(+), 3 deletions(-) > > Thanks. > > -- > Ken ar c'hentañ | ** Breizh ha Linux atav! ** > Jef | http://moinejf.free.fr/ > -- > To unsubscribe from this list: send the line "unsubscribe linux-media" in > the body of a message to majord...@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT PATCHES FOR 2.6.35] gspca for_2.6.35
Hi Mauro, The following changes since commit e411f2dda48c81c556c802d4430717950cf088fd: Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze (2010-06-09 08:52:03 -0700) are available in the git repository at: git://linuxtv.org/jfrancois/gspca.git for_2.6.35 Jean-François Moine (1): gspca - main: Set the wall time as buffer timestamp. drivers/media/video/gspca/gspca.c | 15 --- 1 files changed, 12 insertions(+), 3 deletions(-) Thanks. -- Ken ar c'hentañ | ** Breizh ha Linux atav! ** Jef | http://moinejf.free.fr/ -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT PATCHES for 2.6.35] Update Andy Walls' email address
The following changes since commit 3040547e3be04e635440ad899c71e63373c3: Mauro Carvalho Chehab (1): Merge branch 'staging/v4l1' into devel/for_v2.6.34 are available in the git repository at: ssh://linuxtv.org/git/awalls/v4l-dvb.git contact Andy Walls (1): cx18, cx23885, v4l2 doc, MAINTAINERS: Update Andy Walls' email address Documentation/DocBook/v4l/v4l2.xml |2 +- MAINTAINERS |4 ++-- drivers/media/video/cx18/cx18-alsa-main.c |2 +- drivers/media/video/cx18/cx18-alsa-mixer.c |2 +- drivers/media/video/cx18/cx18-alsa-mixer.h |2 +- drivers/media/video/cx18/cx18-alsa-pcm.c|2 +- drivers/media/video/cx18/cx18-alsa-pcm.h|2 +- drivers/media/video/cx18/cx18-alsa.h|2 +- drivers/media/video/cx18/cx18-av-audio.c|2 +- drivers/media/video/cx18/cx18-av-core.c |2 +- drivers/media/video/cx18/cx18-av-core.h |2 +- drivers/media/video/cx18/cx18-av-firmware.c |2 +- drivers/media/video/cx18/cx18-cards.c |2 +- drivers/media/video/cx18/cx18-cards.h |2 +- drivers/media/video/cx18/cx18-driver.c |2 +- drivers/media/video/cx18/cx18-driver.h |2 +- drivers/media/video/cx18/cx18-dvb.c |2 +- drivers/media/video/cx18/cx18-fileops.c |2 +- drivers/media/video/cx18/cx18-firmware.c|2 +- drivers/media/video/cx18/cx18-gpio.c|2 +- drivers/media/video/cx18/cx18-gpio.h|2 +- drivers/media/video/cx18/cx18-i2c.c |2 +- drivers/media/video/cx18/cx18-io.c |2 +- drivers/media/video/cx18/cx18-io.h |4 ++-- drivers/media/video/cx18/cx18-ioctl.c |2 +- drivers/media/video/cx18/cx18-ioctl.h |2 +- drivers/media/video/cx18/cx18-irq.c |2 +- drivers/media/video/cx18/cx18-irq.h |2 +- drivers/media/video/cx18/cx18-mailbox.c |2 +- drivers/media/video/cx18/cx18-mailbox.h |2 +- drivers/media/video/cx18/cx18-queue.c |2 +- drivers/media/video/cx18/cx18-queue.h |2 +- drivers/media/video/cx18/cx18-scb.c |2 +- drivers/media/video/cx18/cx18-scb.h |2 +- drivers/media/video/cx18/cx18-streams.c |2 +- drivers/media/video/cx18/cx18-streams.h |2 +- drivers/media/video/cx23885/cx23885-input.c |2 +- drivers/media/video/cx23885/cx23885-input.h |2 +- drivers/media/video/cx23885/cx23885-ioctl.c |2 +- drivers/media/video/cx23885/cx23885-ioctl.h |2 +- drivers/media/video/cx23885/cx23885-ir.c|2 +- drivers/media/video/cx23885/cx23885-ir.h|2 +- drivers/media/video/cx23885/cx23888-ir.c|2 +- drivers/media/video/cx23885/cx23888-ir.h|2 +- 44 files changed, 46 insertions(+), 46 deletions(-) I hope I got the GIT process right. I'm not even sure what kernel version is due out next. Hopefully 2.6.35 is the earliest available for a trivial change like this. Regards, Andy -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: New procedures for git - was Re: [GIT PATCHES FOR 2.6.35] Convert bw-qcam and c-qcam to V4L2
Laurent Pinchart wrote: > Hi Mauro, > > On Friday 21 May 2010 17:03:04 Mauro Carvalho Chehab wrote: >> Laurent Pinchart wrote: >>> On Friday 21 May 2010 16:05:29 Mauro Carvalho Chehab wrote: Hans Verkuil wrote: > I had hoped to get hardware to test it with, but no such luck (yet). > But there seems to be no sense in holding these patches back on the > off-chance that I can get hardware. > > Gerard, you mentioned earlier that you actually had a c-qcam. It would > be nice if you can test this. Pulled, thanks. I'm now trying a new way of merging patches: I'm creating some topic branches, as /staging/. This is the first merge of the new procedure ;) So, basically, those patches went to /staging/v4l1. I'll periodically merge the staging patches at devel/for_v42.6.35 branches, for patches that I'll send for the current merge window, and at devel/for_v2.6.36, for the patches to the next merge window. >>> When will they be merged to master ? >> There's a very good question. The current master branch has a very dirty >> history, with almost all 2.6.33 and 2.6.34 patches merged twice. I'm not >> sure yet what would be the better way to handle the master branch. >> To avoid make things worse, I'm considering to merge back at master only >> after having the patches merged upstream. > > Isn't that even worse than what we did for 2.6.34 ? How are developers > supposed to test their drivers against changes in the v4l-dvb repository ? By > merging all staging branches manually every time ? You can merge from devel/for_v42.6.35, where all the staging repositories will be merged. The main difference is that I won't merge the "temporary" hashes at master (as patches might be rebased when sending upstream, generating a new hash). I'm considering also to have a v2.6.34+devel branch with 2.6.34 + all staging branches, to help people to test the drivers using git. > This new procedure is still experimental, but I think it will be better than the previous one. > -- Cheers, Mauro -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: New procedures for git - was Re: [GIT PATCHES FOR 2.6.35] Convert bw-qcam and c-qcam to V4L2
Hi Mauro, On Friday 21 May 2010 17:03:04 Mauro Carvalho Chehab wrote: > Laurent Pinchart wrote: > > On Friday 21 May 2010 16:05:29 Mauro Carvalho Chehab wrote: > >> Hans Verkuil wrote: > >>> I had hoped to get hardware to test it with, but no such luck (yet). > >>> But there seems to be no sense in holding these patches back on the > >>> off-chance that I can get hardware. > >>> > >>> Gerard, you mentioned earlier that you actually had a c-qcam. It would > >>> be nice if you can test this. > >> > >> Pulled, thanks. > >> > >> I'm now trying a new way of merging patches: I'm creating some topic > >> branches, as /staging/. This is the first merge of the new > >> procedure ;) > >> > >> So, basically, those patches went to /staging/v4l1. > >> > >> I'll periodically merge the staging patches at devel/for_v42.6.35 > >> branches, for patches that I'll send for the current merge window, and > >> at devel/for_v2.6.36, for the patches to the next merge window. > > > > When will they be merged to master ? > > There's a very good question. The current master branch has a very dirty > history, with almost all 2.6.33 and 2.6.34 patches merged twice. I'm not > sure yet what would be the better way to handle the master branch. > To avoid make things worse, I'm considering to merge back at master only > after having the patches merged upstream. Isn't that even worse than what we did for 2.6.34 ? How are developers supposed to test their drivers against changes in the v4l-dvb repository ? By merging all staging branches manually every time ? > >> This new procedure is still experimental, but I think it will be better > >> than the previous one. -- Regards, Laurent Pinchart -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: New procedures for git - was Re: [GIT PATCHES FOR 2.6.35] Convert bw-qcam and c-qcam to V4L2
Laurent Pinchart wrote: > Hi Mauro, > > On Friday 21 May 2010 16:05:29 Mauro Carvalho Chehab wrote: >> Hans Verkuil wrote: >>> I had hoped to get hardware to test it with, but no such luck (yet). But >>> there seems to be no sense in holding these patches back on the >>> off-chance that I can get hardware. >>> >>> Gerard, you mentioned earlier that you actually had a c-qcam. It would be >>> nice if you can test this. >> Pulled, thanks. >> >> I'm now trying a new way of merging patches: I'm creating some topic >> branches, as /staging/. This is the first merge of the new procedure >> ;) >> >> So, basically, those patches went to /staging/v4l1. >> >> I'll periodically merge the staging patches at devel/for_v42.6.35 branches, >> for patches that I'll send for the current merge window, and at >> devel/for_v2.6.36, for the patches to the next merge window. > > When will they be merged to master ? There's a very good question. The current master branch has a very dirty history, with almost all 2.6.33 and 2.6.34 patches merged twice. I'm not sure yet what would be the better way to handle the master branch. To avoid make things worse, I'm considering to merge back at master only after having the patches merged upstream. > >> This new procedure is still experimental, but I think it will be better >> than the previous one. > -- Cheers, Mauro -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: New procedures for git - was Re: [GIT PATCHES FOR 2.6.35] Convert bw-qcam and c-qcam to V4L2
Hi Mauro, On Friday 21 May 2010 16:05:29 Mauro Carvalho Chehab wrote: > Hans Verkuil wrote: > > I had hoped to get hardware to test it with, but no such luck (yet). But > > there seems to be no sense in holding these patches back on the > > off-chance that I can get hardware. > > > > Gerard, you mentioned earlier that you actually had a c-qcam. It would be > > nice if you can test this. > > Pulled, thanks. > > I'm now trying a new way of merging patches: I'm creating some topic > branches, as /staging/. This is the first merge of the new procedure > ;) > > So, basically, those patches went to /staging/v4l1. > > I'll periodically merge the staging patches at devel/for_v42.6.35 branches, > for patches that I'll send for the current merge window, and at > devel/for_v2.6.36, for the patches to the next merge window. When will they be merged to master ? > This new procedure is still experimental, but I think it will be better > than the previous one. -- Regards, Laurent Pinchart -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
New procedures for git - was Re: [GIT PATCHES FOR 2.6.35] Convert bw-qcam and c-qcam to V4L2
Hans Verkuil wrote: > I had hoped to get hardware to test it with, but no such luck (yet). But > there seems to be no sense in holding these patches back on the off-chance > that I can get hardware. > > Gerard, you mentioned earlier that you actually had a c-qcam. It would be > nice if you can test this. Pulled, thanks. I'm now trying a new way of merging patches: I'm creating some topic branches, as /staging/. This is the first merge of the new procedure ;) So, basically, those patches went to /staging/v4l1. I'll periodically merge the staging patches at devel/for_v42.6.35 branches, for patches that I'll send for the current merge window, and at devel/for_v2.6.36, for the patches to the next merge window. This new procedure is still experimental, but I think it will be better than the previous one. -- Cheers, Mauro -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT PATCHES FOR 2.6.35] gspca for_2.6.35
Hi Mauro, I removed the patch from Sarah Sharp. The following changes since commit 4fcfa8824391ef0f9cff82122067f31c6d920921: V4L/DVB: vivi and mem2mem_testdev need slab.h to build (2010-05-12 02:17:35 -0300) are available in the git repository at: git://linuxtv.org/jfrancois/gspca.git for_2.6.35 Jean-François Moine (2): gspca - sonixb: Have 0c45:602e handled by sonixb instead of sn9c102. gspca - sonixj: Add information about some potential JPEG webcams. Warren Bosworth Focke (1): gspca - sonixj: Add webcam 0c45:60ce. Documentation/video4linux/gspca.txt|1 + drivers/media/video/gspca/sonixb.c |2 -- drivers/media/video/gspca/sonixj.c |5 - drivers/media/video/sn9c102/sn9c102_devtable.h |2 +- 4 files changed, 6 insertions(+), 4 deletions(-) Thanks. -- Ken ar c'hentañ | ** Breizh ha Linux atav! ** Jef | http://moinejf.free.fr/ -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [GIT PATCHES FOR 2.6.35] More _fmt to _mbus_fmt conversions
On Monday 10 May 2010 08:42:29 Hans Verkuil wrote: > On Sunday 09 May 2010 15:30:24 Hans Verkuil wrote: > > The following changes since commit 08b8618ac4dbcd05ec1886853b1d865798d26e1d: > > Devin Heitmueller (1): > > V4L/DVB: ngene: Add lgdt3303 and mt2131 deps to Kconfig > > > > are available in the git repository at: > > > > ssh://linuxtv.org/git/hverkuil/v4l-dvb.git mbus1 > > > > Tested with ivtv, cx18, saa7134-empress and pvrusb2. > > > > This is the first patch series of driver conversions. These are all pretty > > trivial and basically just replace enum/try/g/s_fmt with > > enum/try/g/s_mbus_fmt. > > > > There will be two or three more patch series but some need to be reviewed > > first. > > > > The goal is to get rid of enum/try/g/s_fmt in the video ops. It's the wrong > > API at that level and as long as it is in the video ops people will misuse > > it. > > Now that I received the Ack from Guennadi I've also added this patch to the > pull request: > > v4l2-subdev.h: fix enum_mbus_fmt prototype > > Guennadi: I've changed unsigned to unsigned int. And with Vaibhav's ack I've added those patches as well: tvp514x: do NOT change the std as a side effect tvp514x: make std_list const tvp514x: there is only one supported format, so simplify the code tvp514x: add missing newlines tvp514x: remove obsolete fmt_list tvp514x: simplify try/g/s_fmt handling Regards, Hans > > > Hans Verkuil (21): > > V4L2 Spec: Improve the VIDIOC_QUERY_DV_PRESET description > > saa7115: add s_mbus_fmt op > > cx25840: add support for s_mbus_fmt > > saa717x: add support for s_mbus_fmt > > ivtv: convert to use s_mbus_fmt > > cx18: add s_mbus_fmt support > > cx18: remove old g/s_fmt from the cx18_av subdev > > saa7127: remove obsolete g_fmt support > > saa717x: remove obsolete s_fmt op > > v4l2-mediabus.h: add two helper functions > > saa6752hs: add g/s_mbus_fmt support > > saa7134: convert to use the new mbus API > > pvrusb2: convert to s_mbus_fmt > > cx23885: convert to s_mbus_fmt > > cx231xx: convert to s_mbus_fmt > > cx24850: remove obsolete g/s_fmt ops > > saa7115: remove obsolete g/s_fmt ops > > v4l2-mediabus.h: added V4L2_MBUS_FMT_SGRBG8_1X8 > > mt9v011: add enum/try/s_mbus_fmt support > > tvp5150: remove obsolete g/s_fmt ops > > au8522_decoder: g/s_fmt doesn't do anything: remove. > > > > .../DocBook/v4l/vidioc-query-dv-preset.xml |6 +- > > drivers/media/dvb/frontends/au8522_decoder.c | 26 > > drivers/media/video/cx18/cx18-av-core.c| 125 > > +--- > > drivers/media/video/cx18/cx18-controls.c | 11 +- > > drivers/media/video/cx18/cx18-ioctl.c |8 +- > > drivers/media/video/cx231xx/cx231xx-video.c|5 +- > > drivers/media/video/cx23885/cx23885-video.c|5 +- > > drivers/media/video/cx25840/cx25840-core.c | 99 +++- > > drivers/media/video/ivtv/ivtv-controls.c | 10 +- > > drivers/media/video/ivtv/ivtv-ioctl.c |6 +- > > drivers/media/video/mt9v011.c | 37 +++--- > > drivers/media/video/pvrusb2/pvrusb2-hdw.c | 12 +- > > drivers/media/video/saa7115.c | 19 +-- > > drivers/media/video/saa7127.c |8 -- > > drivers/media/video/saa7134/saa6752hs.c| 46 --- > > drivers/media/video/saa7134/saa7134-empress.c |9 +- > > drivers/media/video/saa717x.c | 38 --- > > drivers/media/video/tvp5150.c | 20 --- > > include/media/v4l2-mediabus.h | 21 > > 19 files changed, 233 insertions(+), 278 deletions(-) > > > > -- Hans Verkuil - video4linux developer - sponsored by TANDBERG, part of Cisco -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT PATCHES FOR 2.6.35] Convert bw-qcam and c-qcam to V4L2
I had hoped to get hardware to test it with, but no such luck (yet). But there seems to be no sense in holding these patches back on the off-chance that I can get hardware. Gerard, you mentioned earlier that you actually had a c-qcam. It would be nice if you can test this. Regards, Hans The following changes since commit 08b8618ac4dbcd05ec1886853b1d865798d26e1d: Devin Heitmueller (1): V4L/DVB: ngene: Add lgdt3303 and mt2131 deps to Kconfig are available in the git repository at: ssh://linuxtv.org/git/hverkuil/v4l-dvb.git v4l1 Hans Verkuil (2): bw-qcam: convert to V4L2 c-qcam: convert to V4L2 drivers/media/video/Kconfig |4 +- drivers/media/video/bw-qcam.c | 759 ++--- drivers/media/video/bw-qcam.h | 69 drivers/media/video/c-qcam.c | 634 ++ 4 files changed, 746 insertions(+), 720 deletions(-) delete mode 100644 drivers/media/video/bw-qcam.h -- Hans Verkuil - video4linux developer - sponsored by TANDBERG, part of Cisco -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [GIT PATCHES FOR 2.6.35] More _fmt to _mbus_fmt conversions
On Sunday 09 May 2010 15:30:24 Hans Verkuil wrote: > The following changes since commit 08b8618ac4dbcd05ec1886853b1d865798d26e1d: > Devin Heitmueller (1): > V4L/DVB: ngene: Add lgdt3303 and mt2131 deps to Kconfig > > are available in the git repository at: > > ssh://linuxtv.org/git/hverkuil/v4l-dvb.git mbus1 > > Tested with ivtv, cx18, saa7134-empress and pvrusb2. > > This is the first patch series of driver conversions. These are all pretty > trivial and basically just replace enum/try/g/s_fmt with > enum/try/g/s_mbus_fmt. > > There will be two or three more patch series but some need to be reviewed > first. > > The goal is to get rid of enum/try/g/s_fmt in the video ops. It's the wrong > API at that level and as long as it is in the video ops people will misuse > it. Now that I received the Ack from Guennadi I've also added this patch to the pull request: v4l2-subdev.h: fix enum_mbus_fmt prototype Guennadi: I've changed unsigned to unsigned int. Regards, Hans > Hans Verkuil (21): > V4L2 Spec: Improve the VIDIOC_QUERY_DV_PRESET description > saa7115: add s_mbus_fmt op > cx25840: add support for s_mbus_fmt > saa717x: add support for s_mbus_fmt > ivtv: convert to use s_mbus_fmt > cx18: add s_mbus_fmt support > cx18: remove old g/s_fmt from the cx18_av subdev > saa7127: remove obsolete g_fmt support > saa717x: remove obsolete s_fmt op > v4l2-mediabus.h: add two helper functions > saa6752hs: add g/s_mbus_fmt support > saa7134: convert to use the new mbus API > pvrusb2: convert to s_mbus_fmt > cx23885: convert to s_mbus_fmt > cx231xx: convert to s_mbus_fmt > cx24850: remove obsolete g/s_fmt ops > saa7115: remove obsolete g/s_fmt ops > v4l2-mediabus.h: added V4L2_MBUS_FMT_SGRBG8_1X8 > mt9v011: add enum/try/s_mbus_fmt support > tvp5150: remove obsolete g/s_fmt ops > au8522_decoder: g/s_fmt doesn't do anything: remove. > > .../DocBook/v4l/vidioc-query-dv-preset.xml |6 +- > drivers/media/dvb/frontends/au8522_decoder.c | 26 > drivers/media/video/cx18/cx18-av-core.c| 125 > +--- > drivers/media/video/cx18/cx18-controls.c | 11 +- > drivers/media/video/cx18/cx18-ioctl.c |8 +- > drivers/media/video/cx231xx/cx231xx-video.c|5 +- > drivers/media/video/cx23885/cx23885-video.c|5 +- > drivers/media/video/cx25840/cx25840-core.c | 99 +++- > drivers/media/video/ivtv/ivtv-controls.c | 10 +- > drivers/media/video/ivtv/ivtv-ioctl.c |6 +- > drivers/media/video/mt9v011.c | 37 +++--- > drivers/media/video/pvrusb2/pvrusb2-hdw.c | 12 +- > drivers/media/video/saa7115.c | 19 +-- > drivers/media/video/saa7127.c |8 -- > drivers/media/video/saa7134/saa6752hs.c| 46 --- > drivers/media/video/saa7134/saa7134-empress.c |9 +- > drivers/media/video/saa717x.c | 38 --- > drivers/media/video/tvp5150.c | 20 --- > include/media/v4l2-mediabus.h | 21 > 19 files changed, 233 insertions(+), 278 deletions(-) > -- Hans Verkuil - video4linux developer - sponsored by TANDBERG, part of Cisco -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT PATCHES FOR 2.6.35] More _fmt to _mbus_fmt conversions
The following changes since commit 08b8618ac4dbcd05ec1886853b1d865798d26e1d: Devin Heitmueller (1): V4L/DVB: ngene: Add lgdt3303 and mt2131 deps to Kconfig are available in the git repository at: ssh://linuxtv.org/git/hverkuil/v4l-dvb.git mbus1 Tested with ivtv, cx18, saa7134-empress and pvrusb2. This is the first patch series of driver conversions. These are all pretty trivial and basically just replace enum/try/g/s_fmt with enum/try/g/s_mbus_fmt. There will be two or three more patch series but some need to be reviewed first. The goal is to get rid of enum/try/g/s_fmt in the video ops. It's the wrong API at that level and as long as it is in the video ops people will misuse it. Regards, Hans Hans Verkuil (21): V4L2 Spec: Improve the VIDIOC_QUERY_DV_PRESET description saa7115: add s_mbus_fmt op cx25840: add support for s_mbus_fmt saa717x: add support for s_mbus_fmt ivtv: convert to use s_mbus_fmt cx18: add s_mbus_fmt support cx18: remove old g/s_fmt from the cx18_av subdev saa7127: remove obsolete g_fmt support saa717x: remove obsolete s_fmt op v4l2-mediabus.h: add two helper functions saa6752hs: add g/s_mbus_fmt support saa7134: convert to use the new mbus API pvrusb2: convert to s_mbus_fmt cx23885: convert to s_mbus_fmt cx231xx: convert to s_mbus_fmt cx24850: remove obsolete g/s_fmt ops saa7115: remove obsolete g/s_fmt ops v4l2-mediabus.h: added V4L2_MBUS_FMT_SGRBG8_1X8 mt9v011: add enum/try/s_mbus_fmt support tvp5150: remove obsolete g/s_fmt ops au8522_decoder: g/s_fmt doesn't do anything: remove. .../DocBook/v4l/vidioc-query-dv-preset.xml |6 +- drivers/media/dvb/frontends/au8522_decoder.c | 26 drivers/media/video/cx18/cx18-av-core.c| 125 +--- drivers/media/video/cx18/cx18-controls.c | 11 +- drivers/media/video/cx18/cx18-ioctl.c |8 +- drivers/media/video/cx231xx/cx231xx-video.c|5 +- drivers/media/video/cx23885/cx23885-video.c|5 +- drivers/media/video/cx25840/cx25840-core.c | 99 +++- drivers/media/video/ivtv/ivtv-controls.c | 10 +- drivers/media/video/ivtv/ivtv-ioctl.c |6 +- drivers/media/video/mt9v011.c | 37 +++--- drivers/media/video/pvrusb2/pvrusb2-hdw.c | 12 +- drivers/media/video/saa7115.c | 19 +-- drivers/media/video/saa7127.c |8 -- drivers/media/video/saa7134/saa6752hs.c| 46 --- drivers/media/video/saa7134/saa7134-empress.c |9 +- drivers/media/video/saa717x.c | 38 --- drivers/media/video/tvp5150.c | 20 --- include/media/v4l2-mediabus.h | 21 19 files changed, 233 insertions(+), 278 deletions(-) -- Hans Verkuil - video4linux developer - sponsored by TANDBERG, part of Cisco -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT PATCHES FOR 2.6.35] gspca for_2.6.35
Hi Mauro, The following changes since commit 08b8618ac4dbcd05ec1886853b1d865798d26e1d: V4L/DVB: ngene: Add lgdt3303 and mt2131 deps to Kconfig (2010-05-07 08:49:42 -0300) are available in the git repository at: git://linuxtv.org/jfrancois/gspca.git for_2.6.35 Jean-François Moine (4): gspca - main: Try a less bandwidth-intensive alt setting. gspca - sonixb: Have 0c45:602e handled by sonixb instead of sn9c102. gspca - sonixj: Add information about some potential JPEG webcams. gspca - sonixj: Add webcam 0c45:60ce. Documentation/video4linux/gspca.txt|1 + drivers/media/video/gspca/gspca.c | 13 - drivers/media/video/gspca/sonixb.c |2 -- drivers/media/video/gspca/sonixj.c |5 - drivers/media/video/sn9c102/sn9c102_devtable.h |2 +- 5 files changed, 14 insertions(+), 9 deletions(-) Thanks. -- Ken ar c'hentañ | ** Breizh ha Linux atav! ** Jef | http://moinejf.free.fr/ -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT PATCHES FOR 2.6.35] tvp7002 fixes
The following changes since commit d3be2fab3a10b6c798a5f9970146d166d3345c37: Jean-François Moine (1): V4L/DVB: gspca - zc3xx: Fix the gamma calculation from the contrast are available in the git repository at: ssh://linuxtv.org/git/hverkuil/v4l-dvb.git tvp7002 Tested on a DM6467T eval board. Regards, Hans Mats Randgaard (3): v4l2-subdev.h: Add support for enum_dv_preset tvp7002.c: Add support for enum_dv_presets tvp7002.c: fix some copy-paste errors in the comments drivers/media/video/tvp7002.c | 40 +--- include/media/v4l2-subdev.h |2 ++ 2 files changed, 31 insertions(+), 11 deletions(-) -- Hans Verkuil - video4linux developer - sponsored by TANDBERG, part of Cisco -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [GIT PATCHES FOR 2.6.35] sn9c20x updates
On Sat, May 1, 2010 at 10:36 AM, Brian Johnson wrote: > The following changes since commit d3be2fab3a10b6c798a5f9970146d166d3345c37: > Jean-François Moine (1): > V4L/DVB: gspca - zc3xx: Fix the gamma calculation from the contrast > > are available in the git repository at: > > git://gitorious.org/v4l-dvb/v4l-dvb.git devel > Added a bugfix for the mt9v111 sensor gspca - sn9c20x: Fix non working mt9v111 sensor Regards, Brian Johnson -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [GIT PATCHES FOR 2.6.35]
On Saturday 01 May 2010 23:09:22 Hans Verkuil wrote: > On Saturday 01 May 2010 13:32:22 Hans Verkuil wrote: > > The following changes since commit d3be2fab3a10b6c798a5f9970146d166d3345c37: > > Jean-François Moine (1): > > V4L/DVB: gspca - zc3xx: Fix the gamma calculation from the contrast > > > > are available in the git repository at: > > > > ssh://linuxtv.org/git/hverkuil/v4l-dvb.git misc > > > > Three fixes and one simplification. The prio changes are trivial but prepare > > the way for moving prio handling into the core framework. > > Added another bug fix: > > em28xx: g_tuner must set type field. > > Setting a frequency with v4l2-ctl -f didn't work with em28xx because > of this bug. Added more bug fixes: v4l2-dev: remove unnecessary lock around atomic clear_bit radio-mr800: let v4l2_device_(un)register handle usb_get/set_intfdata hdpvr: fix disconnect sequence usbvision: don't use usb_set_intfdata, let v4l2_device_register handle this. usbvision: add delay before detecting the saa711x. All tested with my mr800, hdpvr and usbvision devices. Regards, Hans > > Hans Verkuil (4): > > Documentation: fix small error in the ENUMINPUT doc. > > bttv: remove bogus prio check in g_frequency. > > v4l2-common: simplify prio utility functions > > tvp7002: fix query_dv_preset. > > > > Documentation/DocBook/v4l/vidioc-enuminput.xml |2 +- > > drivers/media/video/bt8xx/bttv-driver.c| 23 > > +-- > > drivers/media/video/cpia2/cpia2_v4l.c |4 ++-- > > drivers/media/video/cx18/cx18-controls.c |2 +- > > drivers/media/video/cx18/cx18-fileops.c|2 +- > > drivers/media/video/cx18/cx18-ioctl.c | 16 > > drivers/media/video/davinci/vpfe_capture.c |2 +- > > drivers/media/video/davinci/vpif_capture.c |8 > > drivers/media/video/davinci/vpif_display.c |4 ++-- > > drivers/media/video/ivtv/ivtv-fileops.c|2 +- > > drivers/media/video/ivtv/ivtv-ioctl.c |2 +- > > drivers/media/video/pvrusb2/pvrusb2-v4l2.c |6 +++--- > > drivers/media/video/saa7134/saa7134-video.c| 14 +++--- > > drivers/media/video/tvp7002.c | 13 + > > drivers/media/video/v4l2-common.c | 22 > > +- > > drivers/staging/cx25821/cx25821-audups11.c |6 +++--- > > drivers/staging/cx25821/cx25821-video.c| 10 +- > > drivers/staging/cx25821/cx25821-video0.c |6 +++--- > > drivers/staging/cx25821/cx25821-video1.c |6 +++--- > > drivers/staging/cx25821/cx25821-video2.c |6 +++--- > > drivers/staging/cx25821/cx25821-video3.c |6 +++--- > > drivers/staging/cx25821/cx25821-video4.c |6 +++--- > > drivers/staging/cx25821/cx25821-video5.c |6 +++--- > > drivers/staging/cx25821/cx25821-video6.c |6 +++--- > > drivers/staging/cx25821/cx25821-video7.c |6 +++--- > > drivers/staging/cx25821/cx25821-videoioctl.c |6 +++--- > > drivers/staging/cx25821/cx25821-vidups10.c |6 +++--- > > drivers/staging/cx25821/cx25821-vidups9.c |6 +++--- > > include/media/v4l2-common.h|8 > > 29 files changed, 100 insertions(+), 112 deletions(-) > > > > > > -- Hans Verkuil - video4linux developer - sponsored by TANDBERG, part of Cisco -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT PATCHES FOR 2.6.35] Split off vbi subdev ops in a separate category
The following changes since commit d3be2fab3a10b6c798a5f9970146d166d3345c37: Jean-François Moine (1): V4L/DVB: gspca - zc3xx: Fix the gamma calculation from the contrast are available in the git repository at: ssh://linuxtv.org/git/hverkuil/v4l-dvb.git vbi Currently many subdev drivers implement g/try/s_fmt. However, these calls should be converted to the new g/try/s_mbus_fmt. But before we can start that conversion we should first split off the VBI operations since the _fmt calls are also used for VBI format configuration. This patch series creates a new v4l2_subdev_vbi_ops and moves all VBI related functions to that new struct. Regards, Hans Hans Verkuil (13): v4l: move vbi-specific video ops to a new vbi ops struct v4l: add new subdev vbi ops to handle raw and sliced vbi. saa7115: support new vbi ops to set/get VBI format cx25840: support new vbi ops to set/get VBI format cx18: support new vbi ops to set/get VBI format saa7127: support new vbi ops to set/get VBI format tvp5150: support new vbi ops to set/get VBI format ivtv: switch to new vbi subdev ops cx18: switch to new vbi subdev ops. pvrusb2: switch to new vbi subdev ops cx231xx: switch to new vbi subdev ops em28xx: switch to new vbi subdev ops cx18/cx25840/saa7115/tvp5150: remove vbi support from s_fmt drivers/media/video/cx18/cx18-av-core.c | 21 drivers/media/video/cx18/cx18-av-core.h |5 +- drivers/media/video/cx18/cx18-av-vbi.c | 42 +++-- drivers/media/video/cx18/cx18-ioctl.c |6 +- drivers/media/video/cx18/cx18-streams.c |5 ++- drivers/media/video/cx18/cx18-vbi.c |2 +- drivers/media/video/cx231xx/cx231xx-video.c |4 +- drivers/media/video/cx25840/cx25840-core.c | 17 --- drivers/media/video/cx25840/cx25840-core.h |5 +- drivers/media/video/cx25840/cx25840-vbi.c | 40 +++- drivers/media/video/em28xx/em28xx-video.c |4 +- drivers/media/video/ivtv/ivtv-ioctl.c |6 +- drivers/media/video/ivtv/ivtv-streams.c |5 ++- drivers/media/video/ivtv/ivtv-vbi.c | 16 +++--- drivers/media/video/pvrusb2/pvrusb2-hdw.c |2 +- drivers/media/video/saa7115.c | 43 -- drivers/media/video/saa7127.c | 31 drivers/media/video/tvp5150.c | 67 +-- include/media/v4l2-subdev.h | 66 -- 19 files changed, 220 insertions(+), 167 deletions(-) -- Hans Verkuil - video4linux developer - sponsored by TANDBERG, part of Cisco -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [GIT PATCHES FOR 2.6.35]
On Saturday 01 May 2010 13:32:22 Hans Verkuil wrote: > The following changes since commit d3be2fab3a10b6c798a5f9970146d166d3345c37: > Jean-François Moine (1): > V4L/DVB: gspca - zc3xx: Fix the gamma calculation from the contrast > > are available in the git repository at: > > ssh://linuxtv.org/git/hverkuil/v4l-dvb.git misc > > Three fixes and one simplification. The prio changes are trivial but prepare > the way for moving prio handling into the core framework. Added another bug fix: em28xx: g_tuner must set type field. Setting a frequency with v4l2-ctl -f didn't work with em28xx because of this bug. Regards, Hans > > Hans Verkuil (4): > Documentation: fix small error in the ENUMINPUT doc. > bttv: remove bogus prio check in g_frequency. > v4l2-common: simplify prio utility functions > tvp7002: fix query_dv_preset. > > Documentation/DocBook/v4l/vidioc-enuminput.xml |2 +- > drivers/media/video/bt8xx/bttv-driver.c| 23 +-- > drivers/media/video/cpia2/cpia2_v4l.c |4 ++-- > drivers/media/video/cx18/cx18-controls.c |2 +- > drivers/media/video/cx18/cx18-fileops.c|2 +- > drivers/media/video/cx18/cx18-ioctl.c | 16 > drivers/media/video/davinci/vpfe_capture.c |2 +- > drivers/media/video/davinci/vpif_capture.c |8 > drivers/media/video/davinci/vpif_display.c |4 ++-- > drivers/media/video/ivtv/ivtv-fileops.c|2 +- > drivers/media/video/ivtv/ivtv-ioctl.c |2 +- > drivers/media/video/pvrusb2/pvrusb2-v4l2.c |6 +++--- > drivers/media/video/saa7134/saa7134-video.c| 14 +++--- > drivers/media/video/tvp7002.c | 13 + > drivers/media/video/v4l2-common.c | 22 +- > drivers/staging/cx25821/cx25821-audups11.c |6 +++--- > drivers/staging/cx25821/cx25821-video.c| 10 +- > drivers/staging/cx25821/cx25821-video0.c |6 +++--- > drivers/staging/cx25821/cx25821-video1.c |6 +++--- > drivers/staging/cx25821/cx25821-video2.c |6 +++--- > drivers/staging/cx25821/cx25821-video3.c |6 +++--- > drivers/staging/cx25821/cx25821-video4.c |6 +++--- > drivers/staging/cx25821/cx25821-video5.c |6 +++--- > drivers/staging/cx25821/cx25821-video6.c |6 +++--- > drivers/staging/cx25821/cx25821-video7.c |6 +++--- > drivers/staging/cx25821/cx25821-videoioctl.c |6 +++--- > drivers/staging/cx25821/cx25821-vidups10.c |6 +++--- > drivers/staging/cx25821/cx25821-vidups9.c |6 +++--- > include/media/v4l2-common.h|8 > 29 files changed, 100 insertions(+), 112 deletions(-) > > -- Hans Verkuil - video4linux developer - sponsored by TANDBERG, part of Cisco -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT PATCHES FOR 2.6.35] sn9c20x updates
The following changes since commit d3be2fab3a10b6c798a5f9970146d166d3345c37: Jean-François Moine (1): V4L/DVB: gspca - zc3xx: Fix the gamma calculation from the contrast are available in the git repository at: git://gitorious.org/v4l-dvb/v4l-dvb.git devel Brian Johnson (3): gspca - sn9c20x: Add another laptop to upsidedown device list gspca - sn9c20x: Add another MSI laptop to upsidedown device list gspca - sn9c20x: HAS_BUTTON flag -> HAS_NO_BUTTON flag drivers/media/video/gspca/sn9c20x.c | 30 ++ 1 files changed, 22 insertions(+), 8 deletions(-) Regards, Brian Johnson -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT PATCHES FOR 2.6.35]
The following changes since commit d3be2fab3a10b6c798a5f9970146d166d3345c37: Jean-François Moine (1): V4L/DVB: gspca - zc3xx: Fix the gamma calculation from the contrast are available in the git repository at: ssh://linuxtv.org/git/hverkuil/v4l-dvb.git misc Three fixes and one simplification. The prio changes are trivial but prepare the way for moving prio handling into the core framework. Hans Verkuil (4): Documentation: fix small error in the ENUMINPUT doc. bttv: remove bogus prio check in g_frequency. v4l2-common: simplify prio utility functions tvp7002: fix query_dv_preset. Documentation/DocBook/v4l/vidioc-enuminput.xml |2 +- drivers/media/video/bt8xx/bttv-driver.c| 23 +-- drivers/media/video/cpia2/cpia2_v4l.c |4 ++-- drivers/media/video/cx18/cx18-controls.c |2 +- drivers/media/video/cx18/cx18-fileops.c|2 +- drivers/media/video/cx18/cx18-ioctl.c | 16 drivers/media/video/davinci/vpfe_capture.c |2 +- drivers/media/video/davinci/vpif_capture.c |8 drivers/media/video/davinci/vpif_display.c |4 ++-- drivers/media/video/ivtv/ivtv-fileops.c|2 +- drivers/media/video/ivtv/ivtv-ioctl.c |2 +- drivers/media/video/pvrusb2/pvrusb2-v4l2.c |6 +++--- drivers/media/video/saa7134/saa7134-video.c| 14 +++--- drivers/media/video/tvp7002.c | 13 + drivers/media/video/v4l2-common.c | 22 +- drivers/staging/cx25821/cx25821-audups11.c |6 +++--- drivers/staging/cx25821/cx25821-video.c| 10 +- drivers/staging/cx25821/cx25821-video0.c |6 +++--- drivers/staging/cx25821/cx25821-video1.c |6 +++--- drivers/staging/cx25821/cx25821-video2.c |6 +++--- drivers/staging/cx25821/cx25821-video3.c |6 +++--- drivers/staging/cx25821/cx25821-video4.c |6 +++--- drivers/staging/cx25821/cx25821-video5.c |6 +++--- drivers/staging/cx25821/cx25821-video6.c |6 +++--- drivers/staging/cx25821/cx25821-video7.c |6 +++--- drivers/staging/cx25821/cx25821-videoioctl.c |6 +++--- drivers/staging/cx25821/cx25821-vidups10.c |6 +++--- drivers/staging/cx25821/cx25821-vidups9.c |6 +++--- include/media/v4l2-common.h|8 29 files changed, 100 insertions(+), 112 deletions(-) -- Hans Verkuil - video4linux developer - sponsored by TANDBERG, part of Cisco -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT PATCHES FOR 2.6.35] Updates for the uvcvideo driver
The following changes since commit b88a1e83c9bfa5afbe1dd7481ea15fbea5ad9e55: Hans Verkuil (1): V4L/DVB: v4l spec: document new events are available in the git repository at: git://linuxtv.org/pinchartl/uvcvideo.git uvcvideo Laurent Pinchart (3): uvcvideo: Add support for V4L2_PIX_FMT_Y16 uvcvideo: Flag relative controls as write-only uvcvideo: Prevent division by 0 when control step value is 0 drivers/media/video/uvc/uvc_ctrl.c | 30 ++ drivers/media/video/uvc/uvc_driver.c |7 ++- drivers/media/video/uvc/uvcvideo.h |4 +++- 3 files changed, 27 insertions(+), 14 deletions(-) -- Regards, Laurent Pinchart -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT PATCHES FOR 2.6.35] gspca for_2.6.35
Hi Mauro, The following changes since commit d3be2fab3a10b6c798a5f9970146d166d3345c37: V4L/DVB: gspca - zc3xx: Fix the gamma calculation from the contrast (2010-04-29 02:44:55 -0300) are available in the git repository at: git://linuxtv.org/jfrancois/gspca.git for_2.6.35 Jean-François Moine (1): gspca - main: Convert wMaxPacketSize from little endian 16 to cpu. drivers/media/video/gspca/gspca.c |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Thanks. -- Ken ar c'hentañ | ** Breizh ha Linux atav! ** Jef | http://moinejf.free.fr/ -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
RE: [GIT PATCHES FOR 2.6.35] - Adding OMAP2/3 V4l2 display driver
> -Original Message- > From: Mauro Carvalho Chehab [mailto:mche...@infradead.org] > Sent: Thursday, April 29, 2010 9:31 AM > To: Muralidharan Karicheri > Cc: linux-media@vger.kernel.org; Hiremath, Vaibhav; Hans Verkuil; Karicheri, > Muralidharan > Subject: Re: [GIT PATCHES FOR 2.6.35] - Adding OMAP2/3 V4l2 display driver > > Muralidharan Karicheri wrote: > > Hi Mauro, > > > > Please pull from:- > > > > The following changes since commit > 184b7c85f31583632ad00c062a295b622759eef3: > > Mauro Carvalho Chehab (1): > > ir-core: Fix the delete logic > > > > are available in the git repository at: > > > > git://linuxtv.org/mkaricheri/vpfe-vpbe-video.git for_upstream_04_11 > > > > Vaibhav Hiremath (2): > > V4L2: Add support for OMAP2/3 V4L2 display driver on top of DSS2 > > omap_vout:V4L2 Display: Changed enum return type to int > > > > drivers/media/video/Kconfig |2 + > > drivers/media/video/Makefile|2 + > > drivers/media/video/omap/Kconfig| 11 + > > drivers/media/video/omap/Makefile |7 + > > drivers/media/video/omap/omap_vout.c| 2643 > +++ > > drivers/media/video/omap/omap_voutdef.h | 147 ++ > > drivers/media/video/omap/omap_voutlib.c | 293 > > drivers/media/video/omap/omap_voutlib.h | 34 + > > 8 files changed, 3139 insertions(+), 0 deletions(-) > > create mode 100644 drivers/media/video/omap/Kconfig > > create mode 100644 drivers/media/video/omap/Makefile > > create mode 100644 drivers/media/video/omap/omap_vout.c > > create mode 100644 drivers/media/video/omap/omap_voutdef.h > > create mode 100644 drivers/media/video/omap/omap_voutlib.c > > create mode 100644 drivers/media/video/omap/omap_voutlib.h > > > > Applied. [Hiremath, Vaibhav] Missed to say Thanks. Cleanup patches and enhancement will follow now on top of this. Thanks, Vaibhav > Yet, I didn't like to see all those memory allocations for userprt > inside > the driver. IMO, it would be better placed inside the videobuf code. > > -- > > Cheers, > Mauro -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [GIT PATCHES FOR 2.6.35] - Adding OMAP2/3 V4l2 display driver
Muralidharan Karicheri wrote: > Hi Mauro, > > Please pull from:- > > The following changes since commit 184b7c85f31583632ad00c062a295b622759eef3: > Mauro Carvalho Chehab (1): > ir-core: Fix the delete logic > > are available in the git repository at: > > git://linuxtv.org/mkaricheri/vpfe-vpbe-video.git for_upstream_04_11 > > Vaibhav Hiremath (2): > V4L2: Add support for OMAP2/3 V4L2 display driver on top of DSS2 > omap_vout:V4L2 Display: Changed enum return type to int > > drivers/media/video/Kconfig |2 + > drivers/media/video/Makefile|2 + > drivers/media/video/omap/Kconfig| 11 + > drivers/media/video/omap/Makefile |7 + > drivers/media/video/omap/omap_vout.c| 2643 > +++ > drivers/media/video/omap/omap_voutdef.h | 147 ++ > drivers/media/video/omap/omap_voutlib.c | 293 > drivers/media/video/omap/omap_voutlib.h | 34 + > 8 files changed, 3139 insertions(+), 0 deletions(-) > create mode 100644 drivers/media/video/omap/Kconfig > create mode 100644 drivers/media/video/omap/Makefile > create mode 100644 drivers/media/video/omap/omap_vout.c > create mode 100644 drivers/media/video/omap/omap_voutdef.h > create mode 100644 drivers/media/video/omap/omap_voutlib.c > create mode 100644 drivers/media/video/omap/omap_voutlib.h > Applied. Yet, I didn't like to see all those memory allocations for userprt inside the driver. IMO, it would be better placed inside the videobuf code. -- Cheers, Mauro -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
RE: [GIT PATCHES FOR 2.6.35] - Adding OMAP2/3 V4l2 display driver
> -Original Message- > From: Mauro Carvalho Chehab [mailto:mche...@infradead.org] > Sent: Thursday, April 29, 2010 9:31 AM > To: Muralidharan Karicheri > Cc: linux-media@vger.kernel.org; Hiremath, Vaibhav; Hans Verkuil; Karicheri, > Muralidharan > Subject: Re: [GIT PATCHES FOR 2.6.35] - Adding OMAP2/3 V4l2 display driver > > Muralidharan Karicheri wrote: > > Hi Mauro, > > > > Please pull from:- > > > > The following changes since commit > 184b7c85f31583632ad00c062a295b622759eef3: > > Mauro Carvalho Chehab (1): > > ir-core: Fix the delete logic > > > > are available in the git repository at: > > > > git://linuxtv.org/mkaricheri/vpfe-vpbe-video.git for_upstream_04_11 > > > > Vaibhav Hiremath (2): > > V4L2: Add support for OMAP2/3 V4L2 display driver on top of DSS2 > > omap_vout:V4L2 Display: Changed enum return type to int > > > > drivers/media/video/Kconfig |2 + > > drivers/media/video/Makefile|2 + > > drivers/media/video/omap/Kconfig| 11 + > > drivers/media/video/omap/Makefile |7 + > > drivers/media/video/omap/omap_vout.c| 2643 > +++ > > drivers/media/video/omap/omap_voutdef.h | 147 ++ > > drivers/media/video/omap/omap_voutlib.c | 293 > > drivers/media/video/omap/omap_voutlib.h | 34 + > > 8 files changed, 3139 insertions(+), 0 deletions(-) > > create mode 100644 drivers/media/video/omap/Kconfig > > create mode 100644 drivers/media/video/omap/Makefile > > create mode 100644 drivers/media/video/omap/omap_vout.c > > create mode 100644 drivers/media/video/omap/omap_voutdef.h > > create mode 100644 drivers/media/video/omap/omap_voutlib.c > > create mode 100644 drivers/media/video/omap/omap_voutlib.h > > > > Applied. Yet, I didn't like to see all those memory allocations for userprt > inside > the driver. IMO, it would be better placed inside the videobuf code. > [Hiremath, Vaibhav] Mauro, The OMAP is a really different device in terms of how the features are supported; let's take an example of rotation here, Rotation is supported by another separate hardware module called VRFB (Virtual rotation FB) and there are some constraints on how you can use it, for example, the line length (pitch) must be 2048. Also VRFB has 12 contexts only and shared all over system (V4L2 display and Fbdev driver) so we should be using it efficiently. Now as an application user I wouldn't want to consider this constraint and allocate this much huge buffer although we are not using it. Also most of the cases buffers come from other modules like, codes, DSP side application. So the approach we took here is, we are limiting user application to use 4 buffers only in case of rotation enabled. And differentiating user and VRFB buffers, so that user doesn't have to care about all VRFB related constraints here. Internally system DMA copies user buffer to VRFB buffers. That's where we required buffer allocation which can not be generic. Thanks, Vaibhav > -- > > Cheers, > Mauro -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT PATCHES FOR 2.6.35] Updates for the uvcvideo driver
The following changes since commit b88a1e83c9bfa5afbe1dd7481ea15fbea5ad9e55: Hans Verkuil (1): V4L/DVB: v4l spec: document new events are available in the git repository at: git://linuxtv.org/pinchartl/uvcvideo.git uvcvideo Laurent Pinchart (3): uvcvideo: Add support for V4L2_PIX_FMT_Y16 uvcvideo: Flag relative controls as write-only uvcvideo: Prevent division by 0 when control step value is 0 drivers/media/video/uvc/uvc_ctrl.c | 30 ++ drivers/media/video/uvc/uvc_driver.c |7 ++- drivers/media/video/uvc/uvcvideo.h |4 +++- 3 files changed, 27 insertions(+), 14 deletions(-) -- Regards, Laurent Pinchart -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
RE: [GIT PATCHES FOR 2.6.35] - Adding OMAP2/3 V4l2 display driver
Vaibhav, Thanks for clarifying Murali Karicheri Software Design Engineer Texas Instruments Inc. Germantown, MD 20874 phone: 301-407-9583 email: m-kariche...@ti.com >-Original Message- >From: Hiremath, Vaibhav >Sent: Thursday, April 29, 2010 1:33 AM >To: Mauro Carvalho Chehab; Muralidharan Karicheri >Cc: linux-media@vger.kernel.org; Hans Verkuil; Karicheri, Muralidharan >Subject: RE: [GIT PATCHES FOR 2.6.35] - Adding OMAP2/3 V4l2 display driver > > >> -Original Message- >> From: Mauro Carvalho Chehab [mailto:mche...@infradead.org] >> Sent: Thursday, April 29, 2010 9:31 AM >> To: Muralidharan Karicheri >> Cc: linux-media@vger.kernel.org; Hiremath, Vaibhav; Hans Verkuil; >Karicheri, >> Muralidharan >> Subject: Re: [GIT PATCHES FOR 2.6.35] - Adding OMAP2/3 V4l2 display >driver >> >> Muralidharan Karicheri wrote: >> > Hi Mauro, >> > >> > Please pull from:- >> > >> > The following changes since commit >> 184b7c85f31583632ad00c062a295b622759eef3: >> > Mauro Carvalho Chehab (1): >> > ir-core: Fix the delete logic >> > >> > are available in the git repository at: >> > >> > git://linuxtv.org/mkaricheri/vpfe-vpbe-video.git for_upstream_04_11 >> > >> > Vaibhav Hiremath (2): >> > V4L2: Add support for OMAP2/3 V4L2 display driver on top of DSS2 >> > omap_vout:V4L2 Display: Changed enum return type to int >> > >> > drivers/media/video/Kconfig |2 + >> > drivers/media/video/Makefile|2 + >> > drivers/media/video/omap/Kconfig| 11 + >> > drivers/media/video/omap/Makefile |7 + >> > drivers/media/video/omap/omap_vout.c| 2643 >> +++ >> > drivers/media/video/omap/omap_voutdef.h | 147 ++ >> > drivers/media/video/omap/omap_voutlib.c | 293 >> > drivers/media/video/omap/omap_voutlib.h | 34 + >> > 8 files changed, 3139 insertions(+), 0 deletions(-) >> > create mode 100644 drivers/media/video/omap/Kconfig >> > create mode 100644 drivers/media/video/omap/Makefile >> > create mode 100644 drivers/media/video/omap/omap_vout.c >> > create mode 100644 drivers/media/video/omap/omap_voutdef.h >> > create mode 100644 drivers/media/video/omap/omap_voutlib.c >> > create mode 100644 drivers/media/video/omap/omap_voutlib.h >> > >> >> Applied. >[Hiremath, Vaibhav] Missed to say Thanks. Cleanup patches and enhancement >will follow now on top of this. > >Thanks, >Vaibhav > >> Yet, I didn't like to see all those memory allocations for userprt >> inside >> the driver. IMO, it would be better placed inside the videobuf code. >> >> -- >> >> Cheers, >> Mauro -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT PATCHES FOR 2.6.35] gspca for_2.6.35
Hi Mauro, The following changes since commit 1fa9d4c07f3ddee1c054a751cd78e53e8b9050b4: Mauro Carvalho Chehab (1): V4L/DVB: videobuf-dma-sg: Avoid using a wrong size are available in the git repository at: git://linuxtv.org/jfrancois/gspca.git for_2.6.35 Jean-François Moine (9): gspca - sonixj: Split the init sequence of sensor ov7630. gspca - sonixj: Adjust debug output. - fix bad function name - add debug info for i2c buffer write gspca - sonixj: Set the colors at startup time. gspca - sonixj: Adjust minor values of sensor ov7630. - set the color gains to null at init time - change value of register 0x9a gspca - sonixj: Reset the bridge after sensor probe. gspca - sonixj: Add sensor soi768. gspca - zc3xx: Fix the light frequency values for pas202b and pb0330. gspca - zc3xx.c: Remove the brightness control. gspca - zc3xx: Fix the gamma calculation from the contrast. drivers/media/video/gspca/sonixj.c | 145 ++-- drivers/media/video/gspca/zc3xx.c | 95 +++ 2 files changed, 133 insertions(+), 107 deletions(-) Thanks. -- Ken ar c'hentañ | ** Breizh ha Linux atav! ** Jef | http://moinejf.free.fr/ -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [GIT PATCHES FOR 2.6.35] videobuf refactoring
Hans Verkuil wrote:
> On Friday 23 April 2010 08:08:01 Mauro Carvalho Chehab wrote:
>> Hans Verkuil wrote:
>>> The following changes since commit 975b06b6c01ba2da4d26a7ba6ea783d5f670aa7d:
>>> Jonathan Corbet (1):
>>> V4L/DVB: ov7670: silence some compiler warnings
>>>
>>> are available in the git repository at:
>>>
>>> git://linuxtv.org/hverkuil/v4l-dvb-videobuf.git videobuf
>>>
>>> Hans Verkuil (8):
>>> v4l videobuf: remove unused mmap callback.
>>> v4l videobuf: remove mmap_free callback
>>> v4l videobuf: remove unused is_mmapped field
>>> v4l videobuf: use struct videobuf_buffer * instead of void * for
>>> videobuf_alloc
>>> v4l videobuf: rename .vmalloc to .vaddr
>>> v4l videobuf: rename videobuf_queue_to_vmalloc to
>>> videobuf_queue_to_vaddr
>>> v4l videobuf: add videobuf_buffer *buf as argument to mmap_mapper
>>> v4l videobuf: move video_copy_to_user and copy_stream to core.
>>>
>>> drivers/media/video/videobuf-core.c | 95 +++-
>>> drivers/media/video/videobuf-dma-contig.c | 109 +++
>>> drivers/media/video/videobuf-dma-sg.c | 139
>>> -
>>> drivers/media/video/videobuf-dvb.c|2 +-
>>> drivers/media/video/videobuf-vmalloc.c| 104 ++
>>> include/media/videobuf-core.h | 29 ++-
>>> 6 files changed, 137 insertions(+), 341 deletions(-)
>>>
>>> Tested with cx88-blackbird, bttv, saa7134-empress, dvb-ttpci, vivi.
>>> The tests were done with userptr, mmap and read().
>>>
>>> There is a lot more that needs to be done, but this is a good start.
>> I got this error when testing the patches with a saa7134 card:
>>
>> [ 9171.989707] ===
>> [ 9171.992696] [ INFO: possible circular locking dependency detected ]
>> [ 9171.992696] 2.6.33 #3
>> [ 9171.992696] ---
>> [ 9171.992696] xawtv/13330 is trying to acquire lock:
>> [ 9171.992696] (&mm->mmap_sem){++}, at: []
>> videobuf_dma_init_user+0x30/0x70 [videobuf_dma_sg]
>> [ 9171.992696]
>> [ 9171.992696] but task is already holding lock:
>> [ 9171.992696] (&q->vb_lock){+.+.+.}, at: []
>> videobuf_read_one+0x3f/0x340 [videobuf_core]
>> [ 9171.992696]
>> [ 9171.992696] which lock already depends on the new lock.
>> [ 9171.992696]
>> [ 9171.992696]
>> [ 9171.992696] the existing dependency chain (in reverse order) is:
>> [ 9171.992696]
>> [ 9171.992696] -> #1 (&q->vb_lock){+.+.+.}:
>> [ 9171.992696][] __lock_acquire+0xd1d/0x1220
>> [ 9171.992696][] lock_acquire+0x8d/0x100
>> [ 9171.992696][] __mutex_lock_common+0x4c/0x370
>> [ 9171.992696][] mutex_lock_nested+0x3f/0x50
>> [ 9171.992696][] videobuf_mmap_mapper+0x39/0xf0
>> [videobuf_core]
>> [ 9171.992696][] video_mmap+0x29/0x40 [saa7134]
>> [ 9171.992696][] v4l2_mmap+0x3b/0x40 [videodev]
>> [ 9171.992696][] mmap_region+0x342/0x480
>> [ 9171.992696][] do_mmap_pgoff+0x25f/0x300
>> [ 9171.992696][] sys_mmap_pgoff+0x199/0x1c0
>> [ 9171.992696][] sysenter_do_call+0x12/0x38
>> [ 9171.992696]
>> [ 9171.992696] -> #0 (&mm->mmap_sem){++}:
>> [ 9171.992696][] __lock_acquire+0xfbf/0x1220
>> [ 9171.992696][] lock_acquire+0x8d/0x100
>> [ 9171.992696][] down_read+0x4e/0x60
>> [ 9171.992696][] videobuf_dma_init_user+0x30/0x70
>> [videobuf_dma_sg]
>> [ 9171.992696][] __videobuf_iolock+0xc4/0x110
>> [videobuf_dma_sg]
>> [ 9171.992696][] videobuf_iolock+0x33/0x80 [videobuf_core]
>> [ 9171.992696][] buffer_prepare+0x1d6/0x230 [saa7134]
>> [ 9171.992696][] videobuf_read_one+0x176/0x340
>> [videobuf_core]
>> [ 9171.992696][] video_read+0x8b/0xc0 [saa7134]
>> [ 9171.992696][] v4l2_read+0x5d/0x70 [videodev]
>> [ 9171.992696][] vfs_read+0x9f/0x190
>> [ 9171.992696][] sys_read+0x42/0x70
>> [ 9171.992696][] sysenter_do_call+0x12/0x38
>> [ 9171.992696]
>> [ 9171.992696] other info that might help us debug this:
>> [ 9171.992696]
>> [ 9171.992696] 1 lock held by xawtv/13330:
>> [ 9171.992696] #0: (&q->vb_lock){+.+.+.}, at: []
>> videobuf_read_one+0x3f/0x340 [videobuf_core]
>> [ 9171.992696]
>> [ 9171.992696] stack backtrace:
>> [ 9171.992696] Pid: 13330, comm: xawtv Tainted: G C 2.6.33 #3
>> [ 9171.992696] Call Trace:
>> [ 9171.992696] [] ? printk+0x1d/0x22
>> [ 9171.992696] [] print_circular_bug+0xc2/0xd0
>> [ 9171.992696] [] __lock_acquire+0xfbf/0x1220
>> [ 9171.992696] [] lock_acquire+0x8d/0x100
>> [ 9171.992696] [] ? videobuf_dma_init_user+0x30/0x70
>> [videobuf_dma_sg]
>> [ 9171.992696] [] down_read+0x4e/0x60
>> [ 9171.992696] [] ? videobuf_dma_init_user+0x30/0x70
>> [videobuf_dma_sg]
>> [ 9171.992696] [] videobuf_dma_init_user+0x30/0x70
>> [videobuf_dma_sg]
>> [ 9171.992696] [] __videobuf_iolock+0xc4/0x110 [vid
RE: [GIT PATCHES FOR 2.6.35] videobuf refactoring
>Mauro Carvalho Chehab wrote:
>Hans Verkuil wrote:
>> The following changes since commit 975b06b6c01ba2da4d26a7ba6ea783d5f670aa7d:
>> Jonathan Corbet (1):
>> V4L/DVB: ov7670: silence some compiler warnings
>>
>> are available in the git repository at:
>>
>> git://linuxtv.org/hverkuil/v4l-dvb-videobuf.git videobuf
>>
>> Hans Verkuil (8):
>> v4l videobuf: remove unused mmap callback.
>> v4l videobuf: remove mmap_free callback
>> v4l videobuf: remove unused is_mmapped field
>> v4l videobuf: use struct videobuf_buffer * instead of void * for
>> videobuf_alloc
>> v4l videobuf: rename .vmalloc to .vaddr
>> v4l videobuf: rename videobuf_queue_to_vmalloc to
>> videobuf_queue_to_vaddr
>> v4l videobuf: add videobuf_buffer *buf as argument to mmap_mapper
>> v4l videobuf: move video_copy_to_user and copy_stream to core.
>>
>> drivers/media/video/videobuf-core.c | 95 +++-
>> drivers/media/video/videobuf-dma-contig.c | 109 +++
>> drivers/media/video/videobuf-dma-sg.c | 139
>> -
>> drivers/media/video/videobuf-dvb.c|2 +-
>> drivers/media/video/videobuf-vmalloc.c| 104 ++
>> include/media/videobuf-core.h | 29 ++-
>> 6 files changed, 137 insertions(+), 341 deletions(-)
>>
>> Tested with cx88-blackbird, bttv, saa7134-empress, dvb-ttpci, vivi.
>> The tests were done with userptr, mmap and read().
>>
>> There is a lot more that needs to be done, but this is a good start.
>
>I got this error when testing the patches with a saa7134 card:
>
>[ 9171.989707] ===
>[ 9171.992696] [ INFO: possible circular locking dependency detected ]
>[ 9171.992696] 2.6.33 #3
>[ 9171.992696] ---
>[ 9171.992696] xawtv/13330 is trying to acquire lock:
>[ 9171.992696] (&mm->mmap_sem){++}, at: []
>videobuf_dma_init_user+0x30/0x70 [videobuf_dma_sg]
>[ 9171.992696]
>[ 9171.992696] but task is already holding lock:
>[ 9171.992696] (&q->vb_lock){+.+.+.}, at: []
>videobuf_read_one+0x3f/0x340 [videobuf_core]
>[ 9171.992696]
>[ 9171.992696] which lock already depends on the new lock.
>[ 9171.992696]
>[ 9171.992696]
>[ 9171.992696] the existing dependency chain (in reverse order) is:
>[ 9171.992696]
>[ 9171.992696] -> #1 (&q->vb_lock){+.+.+.}:
>[ 9171.992696][] __lock_acquire+0xd1d/0x1220
>[ 9171.992696][] lock_acquire+0x8d/0x100
>[ 9171.992696][] __mutex_lock_common+0x4c/0x370
>[ 9171.992696][] mutex_lock_nested+0x3f/0x50
>[ 9171.992696][] videobuf_mmap_mapper+0x39/0xf0
>[videobuf_core]
>[ 9171.992696][] video_mmap+0x29/0x40 [saa7134]
>[ 9171.992696][] v4l2_mmap+0x3b/0x40 [videodev]
>[ 9171.992696][] mmap_region+0x342/0x480
>[ 9171.992696][] do_mmap_pgoff+0x25f/0x300
>[ 9171.992696][] sys_mmap_pgoff+0x199/0x1c0
>[ 9171.992696][] sysenter_do_call+0x12/0x38
>[ 9171.992696]
>[ 9171.992696] -> #0 (&mm->mmap_sem){++}:
>[ 9171.992696][] __lock_acquire+0xfbf/0x1220
>[ 9171.992696][] lock_acquire+0x8d/0x100
>[ 9171.992696][] down_read+0x4e/0x60
>[ 9171.992696][] videobuf_dma_init_user+0x30/0x70
>[videobuf_dma_sg]
>[ 9171.992696][] __videobuf_iolock+0xc4/0x110
>[videobuf_dma_sg]
>[ 9171.992696][] videobuf_iolock+0x33/0x80 [videobuf_core]
>[ 9171.992696][] buffer_prepare+0x1d6/0x230 [saa7134]
>[ 9171.992696][] videobuf_read_one+0x176/0x340
>[videobuf_core]
>[ 9171.992696][] video_read+0x8b/0xc0 [saa7134]
>[ 9171.992696][] v4l2_read+0x5d/0x70 [videodev]
>[ 9171.992696][] vfs_read+0x9f/0x190
>[ 9171.992696][] sys_read+0x42/0x70
>[ 9171.992696][] sysenter_do_call+0x12/0x38
>[ 9171.992696]
>[ 9171.992696] other info that might help us debug this:
>[ 9171.992696]
>[ 9171.992696] 1 lock held by xawtv/13330:
>[ 9171.992696] #0: (&q->vb_lock){+.+.+.}, at: []
>videobuf_read_one+0x3f/0x340 [videobuf_core]
>[ 9171.992696]
>[ 9171.992696] stack backtrace:
>[ 9171.992696] Pid: 13330, comm: xawtv Tainted: G C 2.6.33 #3
>[ 9171.992696] Call Trace:
>[ 9171.992696] [] ? printk+0x1d/0x22
>[ 9171.992696] [] print_circular_bug+0xc2/0xd0
>[ 9171.992696] [] __lock_acquire+0xfbf/0x1220
>[ 9171.992696] [] lock_acquire+0x8d/0x100
>[ 9171.992696] [] ? videobuf_dma_init_user+0x30/0x70
>[videobuf_dma_sg]
>[ 9171.992696] [] down_read+0x4e/0x60
>[ 9171.992696] [] ? videobuf_dma_init_user+0x30/0x70
>[videobuf_dma_sg]
>[ 9171.992696] [] videobuf_dma_init_user+0x30/0x70 [videobuf_dma_sg]
>[ 9171.992696] [] __videobuf_iolock+0xc4/0x110 [videobuf_dma_sg]
>[ 9171.992696] [] ? videobuf_dma_free+0x62/0xb0 [videobuf_dma_sg]
>[ 9171.992696] [] ? trace_hardirqs_on+0xb/0x10
>[ 9171.992696] [] ? __videobuf_iolock+0x0/0x110 [videobuf_dma_sg]
>[ 9171.992696] [] videobuf_iolock+0x33/
Re: [GIT PATCHES FOR 2.6.35] videobuf refactoring
On Friday 23 April 2010 08:21:14 Hans Verkuil wrote:
> On Friday 23 April 2010 08:08:01 Mauro Carvalho Chehab wrote:
> > Hans Verkuil wrote:
> > > The following changes since commit
> > > 975b06b6c01ba2da4d26a7ba6ea783d5f670aa7d:
> > > Jonathan Corbet (1):
> > > V4L/DVB: ov7670: silence some compiler warnings
> > >
> > > are available in the git repository at:
> > >
> > > git://linuxtv.org/hverkuil/v4l-dvb-videobuf.git videobuf
> > >
> > > Hans Verkuil (8):
> > > v4l videobuf: remove unused mmap callback.
> > > v4l videobuf: remove mmap_free callback
> > > v4l videobuf: remove unused is_mmapped field
> > > v4l videobuf: use struct videobuf_buffer * instead of void * for
> > > videobuf_alloc
> > > v4l videobuf: rename .vmalloc to .vaddr
> > > v4l videobuf: rename videobuf_queue_to_vmalloc to
> > > videobuf_queue_to_vaddr
> > > v4l videobuf: add videobuf_buffer *buf as argument to mmap_mapper
> > > v4l videobuf: move video_copy_to_user and copy_stream to core.
> > >
> > > drivers/media/video/videobuf-core.c | 95 +++-
> > > drivers/media/video/videobuf-dma-contig.c | 109 +++
> > > drivers/media/video/videobuf-dma-sg.c | 139
> > > -
> > > drivers/media/video/videobuf-dvb.c|2 +-
> > > drivers/media/video/videobuf-vmalloc.c| 104 ++
> > > include/media/videobuf-core.h | 29 ++-
> > > 6 files changed, 137 insertions(+), 341 deletions(-)
> > >
> > > Tested with cx88-blackbird, bttv, saa7134-empress, dvb-ttpci, vivi.
> > > The tests were done with userptr, mmap and read().
> > >
> > > There is a lot more that needs to be done, but this is a good start.
> >
> > I got this error when testing the patches with a saa7134 card:
> >
> > [ 9171.989707] ===
> > [ 9171.992696] [ INFO: possible circular locking dependency detected ]
> > [ 9171.992696] 2.6.33 #3
> > [ 9171.992696] ---
> > [ 9171.992696] xawtv/13330 is trying to acquire lock:
> > [ 9171.992696] (&mm->mmap_sem){++}, at: []
> > videobuf_dma_init_user+0x30/0x70 [videobuf_dma_sg]
> > [ 9171.992696]
> > [ 9171.992696] but task is already holding lock:
> > [ 9171.992696] (&q->vb_lock){+.+.+.}, at: []
> > videobuf_read_one+0x3f/0x340 [videobuf_core]
> > [ 9171.992696]
> > [ 9171.992696] which lock already depends on the new lock.
> > [ 9171.992696]
> > [ 9171.992696]
> > [ 9171.992696] the existing dependency chain (in reverse order) is:
> > [ 9171.992696]
> > [ 9171.992696] -> #1 (&q->vb_lock){+.+.+.}:
> > [ 9171.992696][] __lock_acquire+0xd1d/0x1220
> > [ 9171.992696][] lock_acquire+0x8d/0x100
> > [ 9171.992696][] __mutex_lock_common+0x4c/0x370
> > [ 9171.992696][] mutex_lock_nested+0x3f/0x50
> > [ 9171.992696][] videobuf_mmap_mapper+0x39/0xf0
> > [videobuf_core]
> > [ 9171.992696][] video_mmap+0x29/0x40 [saa7134]
> > [ 9171.992696][] v4l2_mmap+0x3b/0x40 [videodev]
> > [ 9171.992696][] mmap_region+0x342/0x480
> > [ 9171.992696][] do_mmap_pgoff+0x25f/0x300
> > [ 9171.992696][] sys_mmap_pgoff+0x199/0x1c0
> > [ 9171.992696][] sysenter_do_call+0x12/0x38
> > [ 9171.992696]
> > [ 9171.992696] -> #0 (&mm->mmap_sem){++}:
> > [ 9171.992696][] __lock_acquire+0xfbf/0x1220
> > [ 9171.992696][] lock_acquire+0x8d/0x100
> > [ 9171.992696][] down_read+0x4e/0x60
> > [ 9171.992696][] videobuf_dma_init_user+0x30/0x70
> > [videobuf_dma_sg]
> > [ 9171.992696][] __videobuf_iolock+0xc4/0x110
> > [videobuf_dma_sg]
> > [ 9171.992696][] videobuf_iolock+0x33/0x80 [videobuf_core]
> > [ 9171.992696][] buffer_prepare+0x1d6/0x230 [saa7134]
> > [ 9171.992696][] videobuf_read_one+0x176/0x340
> > [videobuf_core]
> > [ 9171.992696][] video_read+0x8b/0xc0 [saa7134]
> > [ 9171.992696][] v4l2_read+0x5d/0x70 [videodev]
> > [ 9171.992696][] vfs_read+0x9f/0x190
> > [ 9171.992696][] sys_read+0x42/0x70
> > [ 9171.992696][] sysenter_do_call+0x12/0x38
> > [ 9171.992696]
> > [ 9171.992696] other info that might help us debug this:
> > [ 9171.992696]
> > [ 9171.992696] 1 lock held by xawtv/13330:
> > [ 9171.992696] #0: (&q->vb_lock){+.+.+.}, at: []
> > videobuf_read_one+0x3f/0x340 [videobuf_core]
> > [ 9171.992696]
> > [ 9171.992696] stack backtrace:
> > [ 9171.992696] Pid: 13330, comm: xawtv Tainted: G C 2.6.33 #3
> > [ 9171.992696] Call Trace:
> > [ 9171.992696] [] ? printk+0x1d/0x22
> > [ 9171.992696] [] print_circular_bug+0xc2/0xd0
> > [ 9171.992696] [] __lock_acquire+0xfbf/0x1220
> > [ 9171.992696] [] lock_acquire+0x8d/0x100
> > [ 9171.992696] [] ? videobuf_dma_init_user+0x30/0x70
> > [videobuf_dma_sg]
> > [ 9171.992696] [] down_read+0x4e/0x60
> > [ 9171.992696] [] ?
Re: [GIT PATCHES FOR 2.6.35] videobuf refactoring
On Friday 23 April 2010 08:08:01 Mauro Carvalho Chehab wrote:
> Hans Verkuil wrote:
> > The following changes since commit 975b06b6c01ba2da4d26a7ba6ea783d5f670aa7d:
> > Jonathan Corbet (1):
> > V4L/DVB: ov7670: silence some compiler warnings
> >
> > are available in the git repository at:
> >
> > git://linuxtv.org/hverkuil/v4l-dvb-videobuf.git videobuf
> >
> > Hans Verkuil (8):
> > v4l videobuf: remove unused mmap callback.
> > v4l videobuf: remove mmap_free callback
> > v4l videobuf: remove unused is_mmapped field
> > v4l videobuf: use struct videobuf_buffer * instead of void * for
> > videobuf_alloc
> > v4l videobuf: rename .vmalloc to .vaddr
> > v4l videobuf: rename videobuf_queue_to_vmalloc to
> > videobuf_queue_to_vaddr
> > v4l videobuf: add videobuf_buffer *buf as argument to mmap_mapper
> > v4l videobuf: move video_copy_to_user and copy_stream to core.
> >
> > drivers/media/video/videobuf-core.c | 95 +++-
> > drivers/media/video/videobuf-dma-contig.c | 109 +++
> > drivers/media/video/videobuf-dma-sg.c | 139
> > -
> > drivers/media/video/videobuf-dvb.c|2 +-
> > drivers/media/video/videobuf-vmalloc.c| 104 ++
> > include/media/videobuf-core.h | 29 ++-
> > 6 files changed, 137 insertions(+), 341 deletions(-)
> >
> > Tested with cx88-blackbird, bttv, saa7134-empress, dvb-ttpci, vivi.
> > The tests were done with userptr, mmap and read().
> >
> > There is a lot more that needs to be done, but this is a good start.
>
> I got this error when testing the patches with a saa7134 card:
>
> [ 9171.989707] ===
> [ 9171.992696] [ INFO: possible circular locking dependency detected ]
> [ 9171.992696] 2.6.33 #3
> [ 9171.992696] ---
> [ 9171.992696] xawtv/13330 is trying to acquire lock:
> [ 9171.992696] (&mm->mmap_sem){++}, at: []
> videobuf_dma_init_user+0x30/0x70 [videobuf_dma_sg]
> [ 9171.992696]
> [ 9171.992696] but task is already holding lock:
> [ 9171.992696] (&q->vb_lock){+.+.+.}, at: []
> videobuf_read_one+0x3f/0x340 [videobuf_core]
> [ 9171.992696]
> [ 9171.992696] which lock already depends on the new lock.
> [ 9171.992696]
> [ 9171.992696]
> [ 9171.992696] the existing dependency chain (in reverse order) is:
> [ 9171.992696]
> [ 9171.992696] -> #1 (&q->vb_lock){+.+.+.}:
> [ 9171.992696][] __lock_acquire+0xd1d/0x1220
> [ 9171.992696][] lock_acquire+0x8d/0x100
> [ 9171.992696][] __mutex_lock_common+0x4c/0x370
> [ 9171.992696][] mutex_lock_nested+0x3f/0x50
> [ 9171.992696][] videobuf_mmap_mapper+0x39/0xf0
> [videobuf_core]
> [ 9171.992696][] video_mmap+0x29/0x40 [saa7134]
> [ 9171.992696][] v4l2_mmap+0x3b/0x40 [videodev]
> [ 9171.992696][] mmap_region+0x342/0x480
> [ 9171.992696][] do_mmap_pgoff+0x25f/0x300
> [ 9171.992696][] sys_mmap_pgoff+0x199/0x1c0
> [ 9171.992696][] sysenter_do_call+0x12/0x38
> [ 9171.992696]
> [ 9171.992696] -> #0 (&mm->mmap_sem){++}:
> [ 9171.992696][] __lock_acquire+0xfbf/0x1220
> [ 9171.992696][] lock_acquire+0x8d/0x100
> [ 9171.992696][] down_read+0x4e/0x60
> [ 9171.992696][] videobuf_dma_init_user+0x30/0x70
> [videobuf_dma_sg]
> [ 9171.992696][] __videobuf_iolock+0xc4/0x110
> [videobuf_dma_sg]
> [ 9171.992696][] videobuf_iolock+0x33/0x80 [videobuf_core]
> [ 9171.992696][] buffer_prepare+0x1d6/0x230 [saa7134]
> [ 9171.992696][] videobuf_read_one+0x176/0x340
> [videobuf_core]
> [ 9171.992696][] video_read+0x8b/0xc0 [saa7134]
> [ 9171.992696][] v4l2_read+0x5d/0x70 [videodev]
> [ 9171.992696][] vfs_read+0x9f/0x190
> [ 9171.992696][] sys_read+0x42/0x70
> [ 9171.992696][] sysenter_do_call+0x12/0x38
> [ 9171.992696]
> [ 9171.992696] other info that might help us debug this:
> [ 9171.992696]
> [ 9171.992696] 1 lock held by xawtv/13330:
> [ 9171.992696] #0: (&q->vb_lock){+.+.+.}, at: []
> videobuf_read_one+0x3f/0x340 [videobuf_core]
> [ 9171.992696]
> [ 9171.992696] stack backtrace:
> [ 9171.992696] Pid: 13330, comm: xawtv Tainted: G C 2.6.33 #3
> [ 9171.992696] Call Trace:
> [ 9171.992696] [] ? printk+0x1d/0x22
> [ 9171.992696] [] print_circular_bug+0xc2/0xd0
> [ 9171.992696] [] __lock_acquire+0xfbf/0x1220
> [ 9171.992696] [] lock_acquire+0x8d/0x100
> [ 9171.992696] [] ? videobuf_dma_init_user+0x30/0x70
> [videobuf_dma_sg]
> [ 9171.992696] [] down_read+0x4e/0x60
> [ 9171.992696] [] ? videobuf_dma_init_user+0x30/0x70
> [videobuf_dma_sg]
> [ 9171.992696] [] videobuf_dma_init_user+0x30/0x70
> [videobuf_dma_sg]
> [ 9171.992696] [] __videobuf_iolock+0xc4/0x110 [videobuf_dma_sg]
> [ 9171.992696] [] ? videobuf_dma_free+0x62/0xb0 [videobuf_dma_sg]
>
Re: [GIT PATCHES FOR 2.6.35] videobuf refactoring
Hans Verkuil wrote:
> The following changes since commit 975b06b6c01ba2da4d26a7ba6ea783d5f670aa7d:
> Jonathan Corbet (1):
> V4L/DVB: ov7670: silence some compiler warnings
>
> are available in the git repository at:
>
> git://linuxtv.org/hverkuil/v4l-dvb-videobuf.git videobuf
>
> Hans Verkuil (8):
> v4l videobuf: remove unused mmap callback.
> v4l videobuf: remove mmap_free callback
> v4l videobuf: remove unused is_mmapped field
> v4l videobuf: use struct videobuf_buffer * instead of void * for
> videobuf_alloc
> v4l videobuf: rename .vmalloc to .vaddr
> v4l videobuf: rename videobuf_queue_to_vmalloc to
> videobuf_queue_to_vaddr
> v4l videobuf: add videobuf_buffer *buf as argument to mmap_mapper
> v4l videobuf: move video_copy_to_user and copy_stream to core.
>
> drivers/media/video/videobuf-core.c | 95 +++-
> drivers/media/video/videobuf-dma-contig.c | 109 +++
> drivers/media/video/videobuf-dma-sg.c | 139
> -
> drivers/media/video/videobuf-dvb.c|2 +-
> drivers/media/video/videobuf-vmalloc.c| 104 ++
> include/media/videobuf-core.h | 29 ++-
> 6 files changed, 137 insertions(+), 341 deletions(-)
>
> Tested with cx88-blackbird, bttv, saa7134-empress, dvb-ttpci, vivi.
> The tests were done with userptr, mmap and read().
>
> There is a lot more that needs to be done, but this is a good start.
I got this error when testing the patches with a saa7134 card:
[ 9171.989707] ===
[ 9171.992696] [ INFO: possible circular locking dependency detected ]
[ 9171.992696] 2.6.33 #3
[ 9171.992696] ---
[ 9171.992696] xawtv/13330 is trying to acquire lock:
[ 9171.992696] (&mm->mmap_sem){++}, at: []
videobuf_dma_init_user+0x30/0x70 [videobuf_dma_sg]
[ 9171.992696]
[ 9171.992696] but task is already holding lock:
[ 9171.992696] (&q->vb_lock){+.+.+.}, at: []
videobuf_read_one+0x3f/0x340 [videobuf_core]
[ 9171.992696]
[ 9171.992696] which lock already depends on the new lock.
[ 9171.992696]
[ 9171.992696]
[ 9171.992696] the existing dependency chain (in reverse order) is:
[ 9171.992696]
[ 9171.992696] -> #1 (&q->vb_lock){+.+.+.}:
[ 9171.992696][] __lock_acquire+0xd1d/0x1220
[ 9171.992696][] lock_acquire+0x8d/0x100
[ 9171.992696][] __mutex_lock_common+0x4c/0x370
[ 9171.992696][] mutex_lock_nested+0x3f/0x50
[ 9171.992696][] videobuf_mmap_mapper+0x39/0xf0
[videobuf_core]
[ 9171.992696][] video_mmap+0x29/0x40 [saa7134]
[ 9171.992696][] v4l2_mmap+0x3b/0x40 [videodev]
[ 9171.992696][] mmap_region+0x342/0x480
[ 9171.992696][] do_mmap_pgoff+0x25f/0x300
[ 9171.992696][] sys_mmap_pgoff+0x199/0x1c0
[ 9171.992696][] sysenter_do_call+0x12/0x38
[ 9171.992696]
[ 9171.992696] -> #0 (&mm->mmap_sem){++}:
[ 9171.992696][] __lock_acquire+0xfbf/0x1220
[ 9171.992696][] lock_acquire+0x8d/0x100
[ 9171.992696][] down_read+0x4e/0x60
[ 9171.992696][] videobuf_dma_init_user+0x30/0x70
[videobuf_dma_sg]
[ 9171.992696][] __videobuf_iolock+0xc4/0x110
[videobuf_dma_sg]
[ 9171.992696][] videobuf_iolock+0x33/0x80 [videobuf_core]
[ 9171.992696][] buffer_prepare+0x1d6/0x230 [saa7134]
[ 9171.992696][] videobuf_read_one+0x176/0x340 [videobuf_core]
[ 9171.992696][] video_read+0x8b/0xc0 [saa7134]
[ 9171.992696][] v4l2_read+0x5d/0x70 [videodev]
[ 9171.992696][] vfs_read+0x9f/0x190
[ 9171.992696][] sys_read+0x42/0x70
[ 9171.992696][] sysenter_do_call+0x12/0x38
[ 9171.992696]
[ 9171.992696] other info that might help us debug this:
[ 9171.992696]
[ 9171.992696] 1 lock held by xawtv/13330:
[ 9171.992696] #0: (&q->vb_lock){+.+.+.}, at: []
videobuf_read_one+0x3f/0x340 [videobuf_core]
[ 9171.992696]
[ 9171.992696] stack backtrace:
[ 9171.992696] Pid: 13330, comm: xawtv Tainted: G C 2.6.33 #3
[ 9171.992696] Call Trace:
[ 9171.992696] [] ? printk+0x1d/0x22
[ 9171.992696] [] print_circular_bug+0xc2/0xd0
[ 9171.992696] [] __lock_acquire+0xfbf/0x1220
[ 9171.992696] [] lock_acquire+0x8d/0x100
[ 9171.992696] [] ? videobuf_dma_init_user+0x30/0x70
[videobuf_dma_sg]
[ 9171.992696] [] down_read+0x4e/0x60
[ 9171.992696] [] ? videobuf_dma_init_user+0x30/0x70
[videobuf_dma_sg]
[ 9171.992696] [] videobuf_dma_init_user+0x30/0x70 [videobuf_dma_sg]
[ 9171.992696] [] __videobuf_iolock+0xc4/0x110 [videobuf_dma_sg]
[ 9171.992696] [] ? videobuf_dma_free+0x62/0xb0 [videobuf_dma_sg]
[ 9171.992696] [] ? trace_hardirqs_on+0xb/0x10
[ 9171.992696] [] ? __videobuf_iolock+0x0/0x110 [videobuf_dma_sg]
[ 9171.992696] [] videobuf_iolock+0x33/0x80 [videobuf_core]
[ 9171.992696] [] ? saa7134_dma_free+0x4e/0x70 [saa7134]
[ 9171.992696] [] buffer_prepare+0x1d6/0x230 [s
[GIT PATCHES FOR 2.6.35] - Adding OMAP2/3 V4l2 display driver
Hi Mauro, Please pull from:- The following changes since commit 184b7c85f31583632ad00c062a295b622759eef3: Mauro Carvalho Chehab (1): ir-core: Fix the delete logic are available in the git repository at: git://linuxtv.org/mkaricheri/vpfe-vpbe-video.git for_upstream_04_11 Vaibhav Hiremath (2): V4L2: Add support for OMAP2/3 V4L2 display driver on top of DSS2 omap_vout:V4L2 Display: Changed enum return type to int drivers/media/video/Kconfig |2 + drivers/media/video/Makefile|2 + drivers/media/video/omap/Kconfig| 11 + drivers/media/video/omap/Makefile |7 + drivers/media/video/omap/omap_vout.c| 2643 +++ drivers/media/video/omap/omap_voutdef.h | 147 ++ drivers/media/video/omap/omap_voutlib.c | 293 drivers/media/video/omap/omap_voutlib.h | 34 + 8 files changed, 3139 insertions(+), 0 deletions(-) create mode 100644 drivers/media/video/omap/Kconfig create mode 100644 drivers/media/video/omap/Makefile create mode 100644 drivers/media/video/omap/omap_vout.c create mode 100644 drivers/media/video/omap/omap_voutdef.h create mode 100644 drivers/media/video/omap/omap_voutlib.c create mode 100644 drivers/media/video/omap/omap_voutlib.h -- Murali Karicheri mkarich...@gmail.com -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT PATCHES FOR 2.6.35] gspca for_2.6.35
Hi Mauro, The following changes since commit 680af931a10ba684c617038a0149281c193295ff: Mauro Carvalho Chehab (1): V4L/DVB: tm6000: fix compilation due to the lack of a semicolon are available in the git repository at: git://linuxtv.org/jfrancois/gspca.git for_2.6.35 Erik Andrén (1): gspca - stv06xx: Remove the 046d:08da from the stv06xx driver. Jean-François Moine (3): gspca - main: Check the file doing stream on/off. gspca - main: Restart streaming after reqbuf. gspca - main: Stop the webcam when bandwidth too small. drivers/media/video/gspca/gspca.c | 84 --- drivers/media/video/gspca/stv06xx/stv06xx.c |2 - 2 files changed, 49 insertions(+), 37 deletions(-) Thanks. -- Ken ar c'hentañ | ** Breizh ha Linux atav! ** Jef | http://moinejf.free.fr/ -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT PATCHES FOR 2.6.35] Various fixes
The following changes since commit a6eb7bc8e0eea78f96ad1b0f0195ec52b88c6a00: Laurent Pinchart (1): V4L/DVB: uvcvideo: Use POLLOUT and POLLWRNORM for output devices are available in the git repository at: ssh://linuxtv.org/git/hverkuil/v4l-dvb.git fixes Hans Verkuil (10): V4L2 Spec: fix V4L2_CTRL_TYPE_CTRL_CLASS documentation. videodev2.h: move definition of enum v4l2_ctrl_type to the other control types video_ioctl2: do not replace arg with NULL for _IO() ioctls video_ioctl2: don't return, use break. usbvision: remove non-working vbi device DocBook/v4l/compat.xml: add missing w9966: convert to V4L2 v4l2-framework.txt: fix incorrect statement video_ioctl2: handle the v4l1 compat bit first and move VIDIOCGMBUF into the switch ivtv: move the _IO() decoder ioctls into vidioc_default. It's all over the board these patches. Basically cleaning up a bunch of loose ends. Of particular interest are the w9966 conversion. It's untested. I've tried to contact the author or to find this hardware, but without luck. The conversion is pretty trivial, though, so I think we should just go for it. The other interesting patches are those for video_ioctl2. It's basically stuff I found when prototyping the pre/post hooks. Regards, Hans Documentation/DocBook/v4l/compat.xml| 115 +++--- Documentation/DocBook/v4l/vidioc-queryctrl.xml |2 +- Documentation/video4linux/v4l2-framework.txt| 11 +- drivers/media/video/Kconfig |2 +- drivers/media/video/ivtv/ivtv-ioctl.c | 65 ++-- drivers/media/video/usbvision/usbvision-video.c | 77 drivers/media/video/usbvision/usbvision.h |1 - drivers/media/video/v4l2-ioctl.c| 50 ++-- drivers/media/video/w9966.c | 435 +-- include/linux/videodev2.h | 20 +- 10 files changed, 377 insertions(+), 401 deletions(-) -- Hans Verkuil - video4linux developer - sponsored by TANDBERG -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT PATCHES FOR 2.6.35] gspca for_2.6.35
Hi Mauro, The following changes since commit a6eb7bc8e0eea78f96ad1b0f0195ec52b88c6a00: Laurent Pinchart (1): V4L/DVB: uvcvideo: Use POLLOUT and POLLWRNORM for output devices are available in the git repository at: git://linuxtv.org/jfrancois/gspca.git for_2.6.35 Jean-François Moine (4): gspca: Change some copyrights and module authors. gspca - sonixj: Let the JPEG header in the device. gspca - sonixj: Add autogain for sensor gc0307. gspca - vc032x: Change the ov7670 format to YUYV. drivers/media/video/gspca/gspca.c |4 +- drivers/media/video/gspca/sonixj.c | 47 ++- drivers/media/video/gspca/vc032x.c | 747 +++- 3 files changed, 514 insertions(+), 284 deletions(-) Thanks. -- Ken ar c'hentañ | ** Breizh ha Linux atav! ** Jef | http://moinejf.free.fr/ -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT PATCHES FOR 2.6.35] Updates for the uvcvideo driver
The following changes since commit 975b06b6c01ba2da4d26a7ba6ea783d5f670aa7d: Jonathan Corbet (1): V4L/DVB: ov7670: silence some compiler warnings are available in the git repository at: git://linuxtv.org/pinchartl/uvcvideo.git uvcvideo Laurent Pinchart (5): uvcvideo: Add support for unbranded Arkmicro 18ec:3290 webcams uvcvideo: Add support for Packard Bell EasyNote MX52 integrated webcam v4l: Add V4L2_CID_IRIS_ABSOLUTE and V4L2_CID_IRIS_RELATIVE controls uvcvideo: Support iris absolute and relative controls uvcvideo: Use POLLOUT and POLLWRNORM for output devices Documentation/DocBook/v4l/compat.xml | 11 +++ Documentation/DocBook/v4l/controls.xml| 19 +++ Documentation/DocBook/v4l/videodev2.h.xml |3 +++ drivers/media/video/uvc/uvc_ctrl.c| 20 drivers/media/video/uvc/uvc_driver.c | 18 ++ drivers/media/video/uvc/uvc_queue.c |8 ++-- drivers/media/video/v4l2-common.c |3 +++ include/linux/videodev2.h |3 +++ 8 files changed, 83 insertions(+), 2 deletions(-) -- Regards, Laurent Pinchart -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [GIT PATCHES FOR 2.6.35] V4L1 cleanups
I added this patch: arv: convert to V4L2 Takeo Takahashi very kindly tested my conversion on this hardware. Much appreciated! Regards, Hans On Thursday 25 March 2010 00:01:09 Hans Verkuil wrote: > These patches prepare the way to convert these old drivers to V4L2. > I have patches available that build on these cleanups to do the actual > conversion from V4L1 to V4L2 for c-qcam, bw-qcam, arv and w9966, but I > need to review them first. > > The pms change is just a fix and the zoran and meye patches remove some > last V4L1 data structure usages from these drivers. > > Regards, > > Hans > > > The following changes since commit 942ab4762505a51a7a433a7608ba5d3eed6e4f8b: > Jean Delvare (1): > V4L/DVB: saa7134: Fix IR support of some ASUS TV-FM 7135 variants > > are available in the git repository at: > > ssh://linuxtv.org/git/hverkuil/v4l-dvb.git v4l1 > > Hans Verkuil (10): > c-qcam: coding style cleanup > bw-qcam: coding style cleanup > arv: coding style cleanup > w9966: coding style cleanup > v4l: add V4L2_PIX_FMT_Y4 and V4L2_PIX_FMT_Y6 pixelformats > pms: remove unnecessary exclusive open/close > w9966: reorganize the order of functions > w9966: remove camelCase > meye: remove last V4L1 remnants from the code and add v4l2_device > zoran: remove V4L1 videodev.h include > > Documentation/DocBook/v4l/pixfmt.xml | 12 + > drivers/media/video/Kconfig |2 +- > drivers/media/video/arv.c| 153 +++--- > drivers/media/video/bw-qcam.c| 452 ++--- > drivers/media/video/c-qcam.c | 483 +++--- > drivers/media/video/meye.c | 78 ++- > drivers/media/video/meye.h | 10 +- > drivers/media/video/pms.c| 18 - > drivers/media/video/w9966.c | 1074 > ++ > drivers/media/video/zoran/zoran.h| 24 +- > drivers/media/video/zoran/zoran_driver.c | 16 +- > include/linux/meye.h | 12 +- > include/linux/videodev2.h|2 + > 13 files changed, 1122 insertions(+), 1214 deletions(-) > > -- Hans Verkuil - video4linux developer - sponsored by TANDBERG -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT PATCHES FOR 2.6.35] gspca for_2.6.35
Hi Mauro, The following changes since commit 975b06b6c01ba2da4d26a7ba6ea783d5f670aa7d: Jonathan Corbet (1): V4L/DVB: ov7670: silence some compiler warnings are available in the git repository at: git://linuxtv.org/jfrancois/gspca.git for_2.6.35 Costantino Leandro (1): gspca - t613: Add color controls Jean-François Moine (1): sn9c102 / zc0301: Handle webcams when no gspca subdriver conflict. drivers/media/video/gspca/t613.c | 159 ++-- drivers/media/video/sn9c102/sn9c102_devtable.h | 18 ++-- drivers/media/video/zc0301/zc0301_sensor.h |2 +- 3 files changed, 160 insertions(+), 19 deletions(-) Thanks. -- Ken ar c'hentañ | ** Breizh ha Linux atav! ** Jef | http://moinejf.free.fr/ -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT PATCHES FOR 2.6.35] videobuf refactoring
The following changes since commit 975b06b6c01ba2da4d26a7ba6ea783d5f670aa7d: Jonathan Corbet (1): V4L/DVB: ov7670: silence some compiler warnings are available in the git repository at: git://linuxtv.org/hverkuil/v4l-dvb-videobuf.git videobuf Hans Verkuil (8): v4l videobuf: remove unused mmap callback. v4l videobuf: remove mmap_free callback v4l videobuf: remove unused is_mmapped field v4l videobuf: use struct videobuf_buffer * instead of void * for videobuf_alloc v4l videobuf: rename .vmalloc to .vaddr v4l videobuf: rename videobuf_queue_to_vmalloc to videobuf_queue_to_vaddr v4l videobuf: add videobuf_buffer *buf as argument to mmap_mapper v4l videobuf: move video_copy_to_user and copy_stream to core. drivers/media/video/videobuf-core.c | 95 +++- drivers/media/video/videobuf-dma-contig.c | 109 +++ drivers/media/video/videobuf-dma-sg.c | 139 - drivers/media/video/videobuf-dvb.c|2 +- drivers/media/video/videobuf-vmalloc.c| 104 ++ include/media/videobuf-core.h | 29 ++- 6 files changed, 137 insertions(+), 341 deletions(-) Tested with cx88-blackbird, bttv, saa7134-empress, dvb-ttpci, vivi. The tests were done with userptr, mmap and read(). There is a lot more that needs to be done, but this is a good start. Regards, Hans -- Hans Verkuil - video4linux developer - sponsored by TANDBERG -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT PATCHES FOR 2.6.35] saa7134 empress improvements
The following changes since commit 942ab4762505a51a7a433a7608ba5d3eed6e4f8b: Jean Delvare (1): V4L/DVB: saa7134: Fix IR support of some ASUS TV-FM 7135 variants are available in the git repository at: ssh://linuxtv.org/git/hverkuil/v4l-dvb.git saa6752hs Hans Verkuil (2): saa7134/saa6752hs: improve saa6752hs initialization sequence saa7134-empress: enable the saa6752hs at the right places drivers/media/video/saa7134/saa6752hs.c | 21 +++-- drivers/media/video/saa7134/saa7134-core.c| 18 +-- drivers/media/video/saa7134/saa7134-empress.c | 39 - include/media/saa6752hs.h | 15 ++ 4 files changed, 61 insertions(+), 32 deletions(-) Tested with the Behold TV M6 card. These changes will make it easier for Dmitri to implement support for the new uPD61151 encoder. There are still ugly bits in this code. For example, there is really no reason why the MPEG video device node cannot be opened multiple times. Regards, Hans -- Hans Verkuil - video4linux developer - sponsored by TANDBERG -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT PATCHES FOR 2.6.35] - vpfe capture enhancements to support AM3517
Mauro, Please pull from the following:- The following changes since commit 975b06b6c01ba2da4d26a7ba6ea783d5f670aa7d: Jonathan Corbet (1): V4L/DVB: ov7670: silence some compiler warnings are available in the git repository at: git://linuxtv.org/mkaricheri/vpfe-vpbe-video.git for_upstream_03_27 Vaibhav Hiremath (7): V4L: dm644x_ccdc: Debug register read prints removed V4L: vpfe_capture: Add call back function for interrupt clear for vpfe_cfg V4L: dm644x_ccdc: Add 10bit BT support V4L: vpfe_capture: Return 0 from suspend/resume V4L: dm644x_ccdc: Add Suspend/Resume Support V4L: vpfe_capture: Add support for USERPTR mode of operation V4L: tvp514x: Add Powerup sequence during s_input to lock the signal properly drivers/media/video/davinci/dm644x_ccdc.c | 131 +++- drivers/media/video/davinci/dm644x_ccdc_regs.h | 10 ++- drivers/media/video/davinci/vpfe_capture.c | 78 ++- drivers/media/video/tvp514x.c | 13 +++ include/media/davinci/vpfe_capture.h |2 + 5 files changed, 203 insertions(+), 31 deletions(-) -- Murali Karicheri mkarich...@gmail.com -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT PATCHES FOR 2.6.35] V4L1 cleanups
These patches prepare the way to convert these old drivers to V4L2. I have patches available that build on these cleanups to do the actual conversion from V4L1 to V4L2 for c-qcam, bw-qcam, arv and w9966, but I need to review them first. The pms change is just a fix and the zoran and meye patches remove some last V4L1 data structure usages from these drivers. Regards, Hans The following changes since commit 942ab4762505a51a7a433a7608ba5d3eed6e4f8b: Jean Delvare (1): V4L/DVB: saa7134: Fix IR support of some ASUS TV-FM 7135 variants are available in the git repository at: ssh://linuxtv.org/git/hverkuil/v4l-dvb.git v4l1 Hans Verkuil (10): c-qcam: coding style cleanup bw-qcam: coding style cleanup arv: coding style cleanup w9966: coding style cleanup v4l: add V4L2_PIX_FMT_Y4 and V4L2_PIX_FMT_Y6 pixelformats pms: remove unnecessary exclusive open/close w9966: reorganize the order of functions w9966: remove camelCase meye: remove last V4L1 remnants from the code and add v4l2_device zoran: remove V4L1 videodev.h include Documentation/DocBook/v4l/pixfmt.xml | 12 + drivers/media/video/Kconfig |2 +- drivers/media/video/arv.c| 153 +++--- drivers/media/video/bw-qcam.c| 452 ++--- drivers/media/video/c-qcam.c | 483 +++--- drivers/media/video/meye.c | 78 ++- drivers/media/video/meye.h | 10 +- drivers/media/video/pms.c| 18 - drivers/media/video/w9966.c | 1074 ++ drivers/media/video/zoran/zoran.h| 24 +- drivers/media/video/zoran/zoran_driver.c | 16 +- include/linux/meye.h | 12 +- include/linux/videodev2.h|2 + 13 files changed, 1122 insertions(+), 1214 deletions(-) -- Hans Verkuil - video4linux developer - sponsored by TANDBERG -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT PATCHES FOR 2.6.35] gspca for_2.6.35
Hi Mauro, The following changes since commit 52744e816710ed65e6fc34b79149268d95b2ebdf: Hans Verkuil (1): V4L/DVB: v4l2: sort chip IDs in v4l2-chip-ident.h are available in the git repository at: git://linuxtv.org/jfrancois/gspca.git for_2.6.35 Jean-François Moine (2): gspca - sonixj: More static const and better array initialization. gspca - sonixj: Add webcam 0c45:6142 with sensors gc0307 and po2030n. Documentation/video4linux/gspca.txt |1 + drivers/media/video/gspca/sonixj.c | 433 +-- 2 files changed, 368 insertions(+), 66 deletions(-) Thanks. -- Ken ar c'hentañ | ** Breizh ha Linux atav! ** Jef | http://moinejf.free.fr/ -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT PATCHES FOR 2.6.35] sn9c20x patches
Mauro, Oops sorry about forgetting my SOB line on ht e last pull request. This series has been updated with the proper SOB line. The following changes since commit 52744e816710ed65e6fc34b79149268d95b2ebdf: Hans Verkuil (1): V4L/DVB: v4l2: sort chip IDs in v4l2-chip-ident.h are available in the git repository at: git://gitorious.org/v4l-dvb/v4l-dvb.git devel Brian Johnson (5): gspca - sn9c20x: use gspca's input device handling gspca - sn9c20x: Add support for camera LEDs gspca - sn9c20x: Add upside down detection gspca - sn9c20x: Add support for cameras using the MT9M112 sensor gspca - sn9c20x: Fix bug with OV9655 code Documentation/video4linux/gspca.txt |4 + drivers/media/video/gspca/Kconfig |6 - drivers/media/video/gspca/sn9c20x.c | 313 +-- 3 files changed, 156 insertions(+), 167 deletions(-) Regards, Brian Johnson -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT PATCHES FOR 2.6.35] gspca development
Hi Mauro, Sorry, again. Please forget this pull request. in the git repository at: git://linuxtv.org/jfrancois/gspca.git for_2.6.35 Olivier Lorin (2): gspca - gl860: Updates to prepare the new driver for MI2020 sensor. gspca - gl860: New driver for MI2020 sensor. Thanks. -- Ken ar c'hentañ | ** Breizh ha Linux atav! ** Jef | http://moinejf.free.fr/ -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT PATCHES FOR 2.6.35] gspca development
Hi Mauro, Sorry, the last pull request for 2.6.35. The following changes since commit 942ab4762505a51a7a433a7608ba5d3eed6e4f8b: Jean Delvare (1): V4L/DVB: saa7134: Fix IR support of some ASUS TV-FM 7135 variants are available in the git repository at: git://linuxtv.org/jfrancois/gspca.git for_2.6.35 Olivier Lorin (2): gspca - gl860: Updates to prepare the new driver for MI2020 sensor. gspca - gl860: New driver for MI2020 sensor. drivers/media/video/gspca/gl860/gl860-mi1320.c |1 + drivers/media/video/gspca/gl860/gl860-mi2020.c | 731 +--- drivers/media/video/gspca/gl860/gl860-ov2640.c |1 + drivers/media/video/gspca/gl860/gl860-ov9655.c |5 +- drivers/media/video/gspca/gl860/gl860.c| 52 +-- drivers/media/video/gspca/gl860/gl860.h|6 +- 6 files changed, 288 insertions(+), 508 deletions(-) Thanks. -- Ken ar c'hentañ | ** Breizh ha Linux atav! ** Jef | http://moinejf.free.fr/ -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT PATCHES FOR 2.6.35] Small miscellaneous fixes
Retry. I accidentally based by tree from linux-2.6.git instead of v4l-dvb.git. Sorry about that, hopefully this works better. Hans The following changes since commit 942ab4762505a51a7a433a7608ba5d3eed6e4f8b: Jean Delvare (1): V4L/DVB: saa7134: Fix IR support of some ASUS TV-FM 7135 variants are available in the git repository at: ssh://linuxtv.org/git/hverkuil/v4l-dvb.git misc-fixes Hans Verkuil (3): videobuf-core: fix spelling mistake in debug message. v4l doc: fix font of field name v4l2: sort chip IDs in v4l2-chip-ident.h Michael Hunold (1): saa7146: fix up bytesperline if it is an impossible value Documentation/DocBook/v4l/vidioc-reqbufs.xml |2 +- drivers/media/common/saa7146_video.c |8 +- drivers/media/video/videobuf-core.c |2 +- include/media/v4l2-chip-ident.h | 120 + 4 files changed, 69 insertions(+), 63 deletions(-) -- Hans Verkuil - video4linux developer - sponsored by TANDBERG -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [GIT PATCHES FOR 2.6.35] Small miscellaneous fixes
Hans Verkuil wrote: > The following changes since commit daf9fe2ee9a203c4fc555cfe5c5f3d9f660e743c: > Linus Torvalds (1): > Merge branch 'for-linus' of git://git.kernel.org/.../sameo/mfd-2.6 > > are available in the git repository at: > > ssh://linuxtv.org/git/hverkuil/v4l-dvb.git misc-fixes > > Hans Verkuil (3): > videobuf-core: fix spelling mistake in debug message. > v4l doc: fix font of field name > v4l2: sort chip IDs in v4l2-chip-ident.h > > Michael Hunold (1): > saa7146: fix up bytesperline if it is an impossible value > > Documentation/DocBook/v4l/vidioc-reqbufs.xml |2 +- > drivers/media/common/saa7146_video.c |8 +- > drivers/media/video/videobuf-core.c |2 +- > include/media/v4l2-chip-ident.h | 120 + > 4 files changed, 69 insertions(+), 63 deletions(-) > Hans, Didn't work. You should add your patches after the "master" branch of my tree, and not after upstream "master". So, if you're sending me patches against the development tree, you should use v4l-dvb.git currently, upstream 2.6.33 + V4L/DVB). If you're sending me fixes patches, please use fixes.git (currently, 2.6.34-rc1). Cheers, Mauro. --- $ gitimport ssh://linuxtv.org/git/hverkuil/v4l-dvb.git misc-fixes git checkout -b misc-fixes_tmp work Switched to a new branch 'misc-fixes_tmp' git pull ssh://linuxtv.org/git/hverkuil/v4l-dvb.git misc-fixes remote: Counting objects: 70234, done. remote: Compressing objects: 100% (12013/12013), done. remote: Total 57195 (delta 47167), reused 53957 (delta 44076) Receiving objects: 100% (57195/57195), 14.56 MiB | 53 KiB/s, done. Resolving deltas: 100% (47167/47167), completed with 6840 local objects. >From ssh://linuxtv.org/git/hverkuil/v4l-dvb * branchmisc-fixes -> FETCH_HEAD warning: too many files (created: 900 deleted: 332), skipping inexact rename detection CONFLICT (content): Merge conflict in Documentation/DocBook/v4l/vidioc-reqbufs.xml CONFLICT (content): Merge conflict in drivers/media/IR/ir-keymaps.c CONFLICT (content): Merge conflict in drivers/media/IR/ir-keytable.c CONFLICT (add/add): Merge conflict in drivers/media/IR/ir-sysfs.c CONFLICT (content): Merge conflict in drivers/media/dvb/dm1105/dm1105.c CONFLICT (content): Merge conflict in drivers/media/dvb/dvb-usb/af9015.c CONFLICT (add/add): Merge conflict in drivers/media/dvb/dvb-usb/az6027.c CONFLICT (content): Merge conflict in drivers/media/dvb/dvb-usb/dvb-usb-ids.h CONFLICT (content): Merge conflict in drivers/media/dvb/frontends/stv090x.c CONFLICT (content): Merge conflict in drivers/media/dvb/frontends/stv6110x.c CONFLICT (content): Merge conflict in drivers/media/dvb/mantis/mantis_input.c CONFLICT (add/add): Merge conflict in drivers/media/dvb/ngene/ngene-core.c CONFLICT (content): Merge conflict in drivers/media/dvb/ttpci/budget-ci.c CONFLICT (content): Merge conflict in drivers/media/video/bt8xx/bttv-input.c CONFLICT (content): Merge conflict in drivers/media/video/cx231xx/cx231xx-input.c CONFLICT (content): Merge conflict in drivers/media/video/cx23885/cx23885-input.c CONFLICT (content): Merge conflict in drivers/media/video/cx88/cx88-dvb.c CONFLICT (content): Merge conflict in drivers/media/video/cx88/cx88-input.c CONFLICT (add/add): Merge conflict in drivers/media/video/davinci/isif_regs.h CONFLICT (content): Merge conflict in drivers/media/video/em28xx/em28xx-cards.c CONFLICT (content): Merge conflict in drivers/media/video/em28xx/em28xx-dvb.c CONFLICT (content): Merge conflict in drivers/media/video/em28xx/em28xx-input.c CONFLICT (add/add): Merge conflict in drivers/media/video/gspca/cpia1.c CONFLICT (content): Merge conflict in drivers/media/video/gspca/ov534.c CONFLICT (add/add): Merge conflict in drivers/media/video/gspca/sn9c2028.c CONFLICT (content): Merge conflict in drivers/media/video/ir-kbd-i2c.c CONFLICT (content): Merge conflict in drivers/media/video/saa7134/saa7134-input.c CONFLICT (add/add): Merge conflict in drivers/media/video/tlg2300/pd-dvb.c CONFLICT (add/add): Merge conflict in drivers/media/video/tlg2300/pd-main.c CONFLICT (add/add): Merge conflict in drivers/media/video/tlg2300/pd-radio.c CONFLICT (add/add): Merge conflict in drivers/media/video/tlg2300/pd-video.c CONFLICT (content): Merge conflict in drivers/mfd/Kconfig CONFLICT (content): Merge conflict in drivers/mfd/Makefile CONFLICT (content): Merge conflict in include/media/ir-core.h CONFLICT (content): Merge conflict in include/media/v4l2-chip-ident.h Recorded preimage for 'Documentation/DocBook/v4l/vidioc-reqbufs.xml' Recorded preimage for 'drivers/media/IR/ir-keymaps.c' Recorded preimage for 'drivers/media/IR/ir-keytable.c' Recorded preimage for 'drivers/media/IR/ir-sysfs.c' Recorded preimage for 'drivers/media/dvb/dm1105/dm1105.c' Recorded preimage for 'drivers/media/dvb/dvb-usb/af9015.c' Recorded preimage for 'drivers/media/dvb/dvb-usb/az6027.c' Recorded preimage for 'drivers/media/dvb/dvb-usb/dvb-usb-ids.h' Record
[GIT PATCHES FOR 2.6.35] Small miscellaneous fixes
The following changes since commit daf9fe2ee9a203c4fc555cfe5c5f3d9f660e743c: Linus Torvalds (1): Merge branch 'for-linus' of git://git.kernel.org/.../sameo/mfd-2.6 are available in the git repository at: ssh://linuxtv.org/git/hverkuil/v4l-dvb.git misc-fixes Hans Verkuil (3): videobuf-core: fix spelling mistake in debug message. v4l doc: fix font of field name v4l2: sort chip IDs in v4l2-chip-ident.h Michael Hunold (1): saa7146: fix up bytesperline if it is an impossible value Documentation/DocBook/v4l/vidioc-reqbufs.xml |2 +- drivers/media/common/saa7146_video.c |8 +- drivers/media/video/videobuf-core.c |2 +- include/media/v4l2-chip-ident.h | 120 + 4 files changed, 69 insertions(+), 63 deletions(-) -- Hans Verkuil - video4linux developer - sponsored by TANDBERG -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
