Skip to contentSkip to conversation

V4L/DVB fixes

PATCH In review [email protected] 7 participants 12 messages Jul 25, 2006 – Jul 30, 2006

lore
Share & tools
lore
#0 lore raw

cover V4L/DVB fixes

Linus,

Please pull those fixes from master branch at:
kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git

It contains the following stuff:

- Add dvbpll i2c device check.
- Fix DISEQC regression
- Fix unstable DISEQC behaviour on budget cards.
- Fix broken tda665x PLL definition.
- Fix typo in comment for TDA9819
- Remove stradis MODULE_DEVICE_INFO definition
- Check all __must_check warnings in bttv.
- Support non interlaced capture by default for saa713x
- Saa7134: rename dmasound_{init, exit}
- Bugfix for keycode calculation on NPG remotes
- Set the Auxiliary Byte when tuning LG H06xF in analog mode
- Check __must_check warnings
- [budget/budget-av/budget-ci/budget-patch drivers] fixed DMA start/stop code
- Refine dead code elimination in pvrusb2
- Fix possible dvb-pll oops
- Fix dvb-pll autoprobing
- VIDIOCSMICROCODE were missing on compat_ioctl32
- Fix ext_controls align on 64 bit architectures
- Fix for compilation without V4L1 or V4L1_COMPAT
- Fix broken dependencies on media Kconfig
- OVERLAY flag were enabled by mistake
- Videodev: Handle class_device related errors
- Bttv: use class_device_create_file and handle errors

Cheers,
Mauro.

V4L/DVB development is hosted at http://linuxtv.org
---

 drivers/media/dvb/dvb-core/dvb_frontend.c    |   15 +++--
 drivers/media/dvb/frontends/dvb-pll.c        |   48 ++++++++++------
 drivers/media/dvb/ttpci/av7110.c             |    4 -
 drivers/media/dvb/ttpci/av7110_v4l.c         |   12 ++--
 drivers/media/dvb/ttpci/budget-av.c          |    3 +
 drivers/media/dvb/ttpci/budget-ci.c          |    2 
 drivers/media/dvb/ttpci/budget-core.c        |   57 ++++++++++++++-----
 drivers/media/dvb/ttpci/budget-patch.c       |    2 
 drivers/media/dvb/ttpci/budget.c             |    5 -
 drivers/media/dvb/ttpci/budget.h             |    7 +-
 drivers/media/video/Kconfig                  |    4 -
 drivers/media/video/bt8xx/Kconfig            |    2 
 drivers/media/video/bt8xx/bttv-driver.c      |   31 +++++++---
 drivers/media/video/compat_ioctl32.c         |   24 ++++++++
 drivers/media/video/cpia2/Kconfig            |    2 
 drivers/media/video/cx88/cx88-input.c        |    2 
 drivers/media/video/cx88/cx88-video.c        |    5 -
 drivers/media/video/msp3400-driver.c         |   10 +++
 drivers/media/video/pvrusb2/pvrusb2-hdw.c    |    8 ++
 drivers/media/video/pvrusb2/pvrusb2-io.c     |    9 ++-
 drivers/media/video/pvrusb2/pvrusb2-io.h     |    2 
 drivers/media/video/pvrusb2/pvrusb2-ioread.c |    5 +
 drivers/media/video/pvrusb2/pvrusb2-sysfs.c  |   33 +++++++++--
 drivers/media/video/saa7134/saa7134-alsa.c   |   10 +--
 drivers/media/video/saa7134/saa7134-core.c   |   16 ++---
 drivers/media/video/saa7134/saa7134-oss.c    |   10 +--
 drivers/media/video/saa7134/saa7134-video.c  |    6 +-
 drivers/media/video/saa7134/saa7134.h        |    4 -
 drivers/media/video/stradis.c                |    1 
 drivers/media/video/tuner-core.c             |   31 ++++------
 drivers/media/video/tuner-simple.c           |   19 +++++-
 drivers/media/video/usbvideo/Kconfig         |    8 +-
 drivers/media/video/v4l2-common.c            |   24 ++++----
 drivers/media/video/videodev.c               |   37 +++++++++---
 drivers/media/video/vivi.c                   |    4 -
 include/linux/videodev.h                     |    7 +-
 include/linux/videodev2.h                    |    2 
 include/media/v4l2-dev.h                     |    7 +-
 38 files changed, 323 insertions(+), 155 deletions(-)
#2 lore raw
Quoted 10 lines · Edgar Toernig
Quoted 2 lines · [email protected] wrote:

It contains the following stuff:
[...]

I'm still missing the VBI_OFFSET fix. See:

http://marc.theaimsgroup.com/?m=114710558215044

Could you consider that patch for the next update and IMHO also for 2.6.16.x and 2.6.17.x?

Please read Documentation/SubmittingPatches

Patches without a sign-off will not be included into the kernel.

#3 lore raw
In reply to Edgar Toernig
Quoted 6 lines · Edgar Toernig

I'm still missing the VBI_OFFSET fix. See:

http://marc.theaimsgroup.com/?m=114710558215044

Could you consider that patch for the next update and IMHO also for 2.6.16.x and 2.6.17.x?

I've put a patch that fixes this in my tree. Mauro, please pull from
http://linuxtv.org/hg/~tap/v4l-dvb for:

02/02: bttv: Revert VBI_OFFSET to previous value, it works better
http://www.linuxtv.org/hg/~tap/v4l-dvb?cmd=changeset;node=88eaa291cc50;style=gitweb

FYI, contents of patch:
diff -r aaf8b9916bbb -r 88eaa291cc50 linux/drivers/media/video/bt8xx/bttv-vbi.c
--- a/linux/drivers/media/video/bt8xx/bttv-vbi.c Tue Jul 25 16:37:03 2006
-0700
+++ b/linux/drivers/media/video/bt8xx/bttv-vbi.c Tue Jul 25 17:51:36 2006
-0700
@@ -31,11 +31,16 @@
#include <asm/io.h>
#include "bttvp.h"

-/* Offset from line sync pulse leading edge (0H) in 1 / sampling_rate:

-   bt8x8 /HRESET pulse starts at 0H and has length 64 / fCLKx1 (E|O_VTC
-   HSFMT = 0). VBI_HDELAY (always 0) is an offset from the trailing edge
-   of /HRESET in 1 / fCLKx1, and the sampling_rate tvnorm->Fsc is fCLKx2. */
-#define VBI_OFFSET ((64 + 0) * 2)
+/* Offset from line sync pulse leading edge (0H) to start of VBI capture,
+   in fCLKx2 pixels.  According to the datasheet, VBI capture starts
+   VBI_HDELAY fCLKx1 pixels from the tailing edgeof /HRESET, and /HRESET
+   is 64 fCLKx1 pixels wide.  VBI_HDELAY is set to 0, so this should be
+   (64 + 0) * 2 = 128 fCLKx2 pixels.  But it's not!  The datasheet is
+   Just Plain Wrong.  The real value appears to be different for
+   different revisions of the bt8x8 chips, and to be affected by the
+   horizontal scaling factor.  Experimentally, the value is measured
+   to be about 244.  */

+#define VBI_OFFSET 244

#define VBI_DEFLINES 16
#define VBI_MAXLINES 32

#6 lore raw
In reply to [email protected]

Linus,

I've added 3 more fixes to the tree:

- Correctly handle sysfs error leg file removal in pvrusb2
- Videodev: Check return value of class_device_register() correctly
- Bttv: Revert VBI_OFFSET to previous value, it works better

Please pull these (and the other ones) from master branch at:
kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git

Cheers,
Mauro.

Em Ter, 2006-07-25 às 15:03 -0300, [email protected] escreveu:

Quoted 77 lines

Linus,

Please pull those fixes from master branch at:
kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git

It contains the following stuff:

- Add dvbpll i2c device check.
- Fix DISEQC regression
- Fix unstable DISEQC behaviour on budget cards.
- Fix broken tda665x PLL definition.
- Fix typo in comment for TDA9819
- Remove stradis MODULE_DEVICE_INFO definition
- Check all __must_check warnings in bttv.
- Support non interlaced capture by default for saa713x
- Saa7134: rename dmasound_{init, exit}
- Bugfix for keycode calculation on NPG remotes
- Set the Auxiliary Byte when tuning LG H06xF in analog mode
- Check __must_check warnings
- [budget/budget-av/budget-ci/budget-patch drivers] fixed DMA start/stop code
- Refine dead code elimination in pvrusb2
- Fix possible dvb-pll oops
- Fix dvb-pll autoprobing
- VIDIOCSMICROCODE were missing on compat_ioctl32
- Fix ext_controls align on 64 bit architectures
- Fix for compilation without V4L1 or V4L1_COMPAT
- Fix broken dependencies on media Kconfig
- OVERLAY flag were enabled by mistake
- Videodev: Handle class_device related errors
- Bttv: use class_device_create_file and handle errors

Cheers,
Mauro.

V4L/DVB development is hosted at http://linuxtv.org
---

 drivers/media/dvb/dvb-core/dvb_frontend.c    |   15 +++--
 drivers/media/dvb/frontends/dvb-pll.c        |   48 ++++++++++------
 drivers/media/dvb/ttpci/av7110.c             |    4 -
 drivers/media/dvb/ttpci/av7110_v4l.c         |   12 ++--
 drivers/media/dvb/ttpci/budget-av.c          |    3 +
 drivers/media/dvb/ttpci/budget-ci.c          |    2 
 drivers/media/dvb/ttpci/budget-core.c        |   57 ++++++++++++++-----
 drivers/media/dvb/ttpci/budget-patch.c       |    2 
 drivers/media/dvb/ttpci/budget.c             |    5 -
 drivers/media/dvb/ttpci/budget.h             |    7 +-
 drivers/media/video/Kconfig                  |    4 -
 drivers/media/video/bt8xx/Kconfig            |    2 
 drivers/media/video/bt8xx/bttv-driver.c      |   31 +++++++---
 drivers/media/video/compat_ioctl32.c         |   24 ++++++++
 drivers/media/video/cpia2/Kconfig            |    2 
 drivers/media/video/cx88/cx88-input.c        |    2 
 drivers/media/video/cx88/cx88-video.c        |    5 -
 drivers/media/video/msp3400-driver.c         |   10 +++
 drivers/media/video/pvrusb2/pvrusb2-hdw.c    |    8 ++
 drivers/media/video/pvrusb2/pvrusb2-io.c     |    9 ++-
 drivers/media/video/pvrusb2/pvrusb2-io.h     |    2 
 drivers/media/video/pvrusb2/pvrusb2-ioread.c |    5 +
 drivers/media/video/pvrusb2/pvrusb2-sysfs.c  |   33 +++++++++--
 drivers/media/video/saa7134/saa7134-alsa.c   |   10 +--
 drivers/media/video/saa7134/saa7134-core.c   |   16 ++---
 drivers/media/video/saa7134/saa7134-oss.c    |   10 +--
 drivers/media/video/saa7134/saa7134-video.c  |    6 +-
 drivers/media/video/saa7134/saa7134.h        |    4 -
 drivers/media/video/stradis.c                |    1 
 drivers/media/video/tuner-core.c             |   31 ++++------
 drivers/media/video/tuner-simple.c           |   19 +++++-
 drivers/media/video/usbvideo/Kconfig         |    8 +-
 drivers/media/video/v4l2-common.c            |   24 ++++----
 drivers/media/video/videodev.c               |   37 +++++++++---
 drivers/media/video/vivi.c                   |    4 -
 include/linux/videodev.h                     |    7 +-
 include/linux/videodev2.h                    |    2 
 include/media/v4l2-dev.h                     |    7 +-
 38 files changed, 323 insertions(+), 155 deletions(-)
Quoted 4 lines

--
video4linux-list mailing list
Unsubscribe mailto:[email protected]?subject=unsubscribe
https://www.redhat.com/mailman/listinfo/video4linux-list

Cheers,
Mauro.

#7 lore raw
Quoted 3 lines · Mauro Carvalho Chehab

Please pull these (and the other ones) from master branch at:
kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git

I get a _huge_ diffstat with

 135 files changed, 3056 insertions(+), 1562 deletions(-)

from this, so I _really_ don't want to pull them, especially as your previous version indicated just:

Quoted 1 line
Quoted 1 line
 38 files changed, 323 insertions(+), 155 deletions(-)

which is almost an order of magnitude less.

It's much too late to do this kind of big changes now.

Linus

#8 lore raw
Quoted 8 lines · Linus Torvalds
Quoted 3 lines · Mauro Carvalho Chehab

Please pull these (and the other ones) from master branch at:
kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git

I get a _huge_ diffstat with

 135 files changed, 3056 insertions(+), 1562 deletions(-)

There are mostly two things which did this.

One is that Mauro translated almost all of the V4L1 radio card drivers to V4L2. The changes are all very repetitive, but it made a huge diffstat:

 15 files changed, 1758 insertions(+), 918 deletions(-)

The second source is the dvb_attach() system, which was not supposed to go in 2.6.18, it was for 2.6.19.

 74 files changed, 827 insertions(+), 622 deletions(-)

The dvb_attach() stuff isn't ready for 2.6.18, it hasn't been tested at all and it's a very significant change. The ISA radio card drivers.... I don't think they are used very much anymore.

#9 lore raw

Hi

Em Dom, 2006-07-30 às 00:11 -0700, Trent Piepho escreveu:

Quoted 9 lines · Linus Torvalds
Quoted 8 lines · Mauro Carvalho Chehab
Quoted 3 lines

Please pull these (and the other ones) from master branch at:
kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git

I get a _huge_ diffstat with

 135 files changed, 3056 insertions(+), 1562 deletions(-)

I suspect Linus tried to merge from branch "devel", instead of "master".

Quoted 8 lines

There are mostly two things which did this.

One is that Mauro translated almost all of the V4L1 radio card drivers to V4L2. The changes are all very repetitive, but it made a huge diffstat:

 15 files changed, 1758 insertions(+), 918 deletions(-)
Quoted 8 lines

The second source is the dvb_attach() system, which was not supposed to go in 2.6.18, it was for 2.6.19.

 74 files changed, 827 insertions(+), 622 deletions(-)

The dvb_attach() stuff isn't ready for 2.6.18, it hasn't been tested at all and it's a very significant change. The ISA radio card drivers.... I don't think they are used very much anymore.

No. The stuff to Linus is at branch "master" on my tree, with the bug fixes. V4L1 conversion, dvb_attach and other neat stuff are on branch "devel", and are meant to go to kernel 2.6.19 or upper.

Cheers,
Mauro.

#10 lore raw
In reply to Linus Torvalds

Linus,

Em Sáb, 2006-07-29 às 23:02 -0700, Linus Torvalds escreveu:

Quoted 4 lines · Mauro Carvalho Chehab
Quoted 2 lines

Please pull these (and the other ones) from master branch at:

                                                ++++++
Quoted 5 lines
Quoted 1 line

kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git

I get a _huge_ diffstat with

 135 files changed, 3056 insertions(+), 1562 deletions(-)

I suspect you tried to pull from branch "devel". Branch "master" seems ok to me.

$ git cherry -v origin
+ 061b623c54c5722fbb55fddbbdacbf97e8a82701 V4L/DVB (4291): Add dvbpll
i2c device check.
+ 04c56d0e5b27f1f65e4d20b46731d55341d42a6a V4L/DVB (4292): Fix DISEQC
regression
+ f2813093810276a2a3c1f116f23baf2ab7a669bd V4L/DVB (4293): Fix unstable
DISEQC behaviour on budget cards.
+ 93e2b1ae97dedd66ca0cb8ac1a5ceb4904631091 V4L/DVB (4294): Fix broken
tda665x PLL definition.
+ 6a85774741f1ef1a47ba0670e99c97e892930cad V4L/DVB (4295): Fix typo in
comment for TDA9819
+ 6ba475042f0ca54bf055ce94b2a1e4656ed143f9 V4L/DVB (4296): Remove
stradis MODULE_DEVICE_INFO definition
+ c526e224e4075eff788a992f59bc4a9006b12923 V4L/DVB (4298): Check all
__must_check warnings in bttv.
+ d5fdd1354e04658ea25150cc152a395bb6ecb6da V4L/DVB (4306): Support non
interlaced capture by default for saa713x
+ 7845701820c420454bcfdc4902fad68901d9ff83 V4L/DVB (4310): Saa7134:
rename dmasound_{init, exit}
+ a62c61d3820417e8efac8796f0a46d7ab337af8d V4L/DVB (4313): Bugfix for
keycode calculation on NPG remotes
+ d9cd2d9b61898354f5dbabdc490dd6ef309ebbd4 V4L/DVB (4314): Set the
Auxiliary Byte when tuning LG H06xF in analog mode
+ 3117beec7e43f91ce156cacf033a712c7e22737d V4L/DVB (4316): Check
__must_check warnings
+ 32e4c3a5622e832938aa0272e21a292564ff090a V4L/DVB (4323):
[budget/budget-av/budget-ci/budget-patch drivers] fixed DMA start/stop
code
+ e61b6fc58b4a0b07f1ccfc67bf2b84a2848fcb2c V4L/DVB (4337): Refine dead
code elimination in pvrusb2
+ 55c05b6d226f68266d1f88dd81795b04d096b1c8 V4L/DVB (4311): Fix possible
dvb-pll oops
+ 95faba22d8b81f0cd85b995232b7d05c45a26f3e V4L/DVB (4322): Fix dvb-pll
autoprobing
+ eb4eeccc18246c852fffc771efc3c07a547aeb97 V4L/DVB (4341):
VIDIOCSMICROCODE were missing on compat_ioctl32
+ f251d23eaee673524171b24a71a8794acf82783e V4L/DVB (4342): Fix
ext_controls align on 64 bit architectures
+ 985bc96e27c729b8b686126ed26bba9fbaaf562d V4L/DVB (4343): Fix for
compilation without V4L1 or V4L1_COMPAT
+ fb0b664c22b80df62c9e555afcde6a8dab08f4f0 V4L/DVB (4344): Fix broken
dependencies on media Kconfig
+ df2732706c745c827762aaf51892f281fb937680 V4L/DVB (4365): OVERLAY flag
were enabled by mistake
+ 53dd8def52100ed8be4dae0cf1c2dc1f7e0fcd2c V4L/DVB (4367): Videodev:
Handle class_device related errors
+ d94fc9a08e51432d0d5fc0f74a4f705d7b49c251 V4L/DVB (4368): Bttv: use
class_device_create_file and handle errors
+ 08d41808362a3663c0856c9720ad940a61156fb5 V4L/DVB (4373): Correctly
handle sysfs error leg file removal in pvrusb2
+ 8c313111a2c843610f58d57b4e02159fecef4bbf V4L/DVB (4379): Videodev:
Check return value of class_device_register() correctly
+ ddecbe112b057c333a8e055fb417451a02b9df78 V4L/DVB (4380): Bttv: Revert
VBI_OFFSET to previous value, it works better
$ git-diff origin|diffstat
 drivers/media/dvb/dvb-core/dvb_frontend.c    |   15 ++--
 drivers/media/dvb/frontends/dvb-pll.c        |   24 ++++++-
 drivers/media/dvb/ttpci/av7110.c             |    4 -
 drivers/media/dvb/ttpci/av7110_v4l.c         |   12 +--
 drivers/media/dvb/ttpci/budget-av.c          |    3
 drivers/media/dvb/ttpci/budget-ci.c          |    2
 drivers/media/dvb/ttpci/budget-core.c        |   57 +++++++++++++-----
 drivers/media/dvb/ttpci/budget-patch.c       |    2
 drivers/media/dvb/ttpci/budget.c             |    5 -
 drivers/media/dvb/ttpci/budget.h             |    7 +-
 drivers/media/video/Kconfig                  |    4 -
 drivers/media/video/bt8xx/Kconfig            |    2
 drivers/media/video/bt8xx/bttv-driver.c      |   15 ++++
 drivers/media/video/bt8xx/bttv-vbi.c         |   15 +++-
 drivers/media/video/compat_ioctl32.c         |   24 +++++++
 drivers/media/video/cpia2/Kconfig            |    2
 drivers/media/video/cx88/cx88-input.c        |    2
 drivers/media/video/cx88/cx88-video.c        |    5 -
 drivers/media/video/msp3400-driver.c         |   10 ++-
 drivers/media/video/pvrusb2/pvrusb2-hdw.c    |    8 +-
 drivers/media/video/pvrusb2/pvrusb2-io.c     |    9 +-
 drivers/media/video/pvrusb2/pvrusb2-io.h     |    2
 drivers/media/video/pvrusb2/pvrusb2-ioread.c |    5 -
 drivers/media/video/pvrusb2/pvrusb2-sysfs.c  |   85
+++++++++++++++++++++++----
 drivers/media/video/saa7134/saa7134-alsa.c   |   10 +--
 drivers/media/video/saa7134/saa7134-core.c   |   16 ++---
 drivers/media/video/saa7134/saa7134-oss.c    |   10 +--
 drivers/media/video/saa7134/saa7134-video.c  |    6 -
 drivers/media/video/saa7134/saa7134.h        |    4 -
 drivers/media/video/stradis.c                |    1
 drivers/media/video/tuner-core.c             |   31 +++------
 drivers/media/video/tuner-simple.c           |   19 +++++-
 drivers/media/video/usbvideo/Kconfig         |    8 +-
 drivers/media/video/v4l2-common.c            |   24 ++++---
 drivers/media/video/videodev.c               |   29 +++++++--
 drivers/media/video/vivi.c                   |    4 -
 include/linux/videodev.h                     |    7 +-
 include/linux/videodev2.h                    |    2
 include/media/v4l2-dev.h                     |    7 +-
 39 files changed, 354 insertions(+), 143 deletions(-)

Cheers,
Mauro.

#11 lore raw
In reply to Linus Torvalds

Ar Sad, 2006-07-29 am 23:02 -0700, ysgrifennodd Linus Torvalds:

Quoted 3 lines

which is almost an order of magnitude less.

It's much too late to do this kind of big changes now.

Can we get the small ones in at least , like the fact bttv actually last worked properly about 2.6.16 because someone mistakenly (despite being warned) changed the VBI capture values to match the spec not the chip.

Alan