Skip to contentSkip to conversation

Various fixes and moving solo6x10/go7007 to mainline

GIT PULL Hans Verkuil 2 participants 2 messages Jul 21, 2014 – Jul 22, 2014 Media (V4L/DVB)

lore
Share & tools
lore
#0 lore raw

Hi Mauro,

Here is a set of various fixes: two important ones in v4l2-ioctl and one in vb2. Also some DocBook fixes, a few VBI defines added and documented, a davinci bugfix (reported by the new gcc-4.9 compiler I'm now using for the daily build) and last but not least the move of the solo6x10 and go7007 out of staging into the mainline.

Regards,

Hans

The following changes since commit 0ca1ba2aac5f6b26672099b13040c5b40db93486:

[media] zoran: remove duplicate ZR050_MO_COMP define (2014-07-17 20:07:57 -0300)

are available in the git repository at:

git://linuxtv.org/hverkuil/media_tree.git for-v3.17d

for you to fetch changes up to f50a1bf86405d8377b245145d3e2d1ef5ced6e32:

media: davinci: vpif: fix array out of bound warnings (2014-07-21 16:01:32 +0200)

----------------------------------------------------------------
Hans Verkuil (12):
vb2: fix bytesused == 0 handling
DocBook media: fix incorrect note about packed RGB and colorspace
go7007: update the README, fix checkpatch warnings
go7007: move out of staging into drivers/media/usb.
solo6x10: a few checkpatch fixes
solo6x10: move out of staging into drivers/media/pci. videodev2.h: add defines for the VBI field start lines DocBook media: document new VBI defines
v4l2-ctrls: fix corner case in round-to-range code DocBook media typo
v4l2-ioctl: set V4L2_CAP_EXT_PIX_FORMAT for device_caps
v4l2-ioctl: don't set PRIV_MAGIC unconditionally in g_fmt()

Prabhakar Lad (1):
media: davinci: vpif: fix array out of bound warnings

 Documentation/DocBook/media/v4l/dev-raw-vbi.xml                   | 12 ++++++---
 Documentation/DocBook/media/v4l/dev-sliced-vbi.xml                |  9 ++++++-
 Documentation/DocBook/media/v4l/pixfmt-packed-rgb.xml             |  3 ---
 Documentation/DocBook/media/v4l/vidioc-queryctrl.xml              |  2 +-
 drivers/media/pci/Kconfig                                         |  1 +
 drivers/media/pci/Makefile                                        |  1 +
 drivers/{staging/media => media/pci}/solo6x10/Kconfig             |  2 +-
 drivers/{staging/media => media/pci}/solo6x10/Makefile            |  2 +-
 drivers/{staging/media => media/pci}/solo6x10/TODO                |  0
 drivers/{staging/media => media/pci}/solo6x10/solo6x10-core.c     |  6 +----
 drivers/{staging/media => media/pci}/solo6x10/solo6x10-disp.c     |  4 ---
 drivers/{staging/media => media/pci}/solo6x10/solo6x10-eeprom.c   |  4 ---
 drivers/{staging/media => media/pci}/solo6x10/solo6x10-enc.c      |  4 ---
 drivers/{staging/media => media/pci}/solo6x10/solo6x10-g723.c     |  4 ---
 drivers/{staging/media => media/pci}/solo6x10/solo6x10-gpio.c     |  4 ---
 drivers/{staging/media => media/pci}/solo6x10/solo6x10-i2c.c      |  4 ---
 drivers/{staging/media => media/pci}/solo6x10/solo6x10-jpeg.h     |  4 ---
 drivers/{staging/media => media/pci}/solo6x10/solo6x10-offsets.h  |  4 ---
 drivers/{staging/media => media/pci}/solo6x10/solo6x10-p2m.c      |  4 ---
 drivers/{staging/media => media/pci}/solo6x10/solo6x10-regs.h     |  4 ---
 drivers/{staging/media => media/pci}/solo6x10/solo6x10-tw28.c     |  5 +---
 drivers/{staging/media => media/pci}/solo6x10/solo6x10-tw28.h     |  4 ---
 drivers/{staging/media => media/pci}/solo6x10/solo6x10-v4l2-enc.c |  7 +++---
 drivers/{staging/media => media/pci}/solo6x10/solo6x10-v4l2.c     |  8 +++---
 drivers/{staging/media => media/pci}/solo6x10/solo6x10.h          |  4 ---
 drivers/media/platform/davinci/vpif_capture.c                     |  2 +-
 drivers/media/platform/davinci/vpif_display.c                     |  2 +-
 drivers/media/usb/Kconfig                                         |  1 +
 drivers/media/usb/Makefile                                        |  1 +
 drivers/{staging/media => media/usb}/go7007/Kconfig               |  0
 drivers/{staging/media => media/usb}/go7007/Makefile              |  0
 drivers/{staging/media => media/usb}/go7007/README                |  1 -
 drivers/{staging/media => media/usb}/go7007/go7007-driver.c       |  6 +----
 drivers/{staging/media => media/usb}/go7007/go7007-fw.c           |  4 ---
 drivers/{staging/media => media/usb}/go7007/go7007-i2c.c          |  4 ---
 drivers/{staging/media => media/usb}/go7007/go7007-loader.c       |  4 ---
 drivers/{staging/media => media/usb}/go7007/go7007-priv.h         |  4 ---
 drivers/{staging/media => media/usb}/go7007/go7007-usb.c          |  4 ---
 drivers/{staging/media => media/usb}/go7007/go7007-v4l2.c         |  4 ---
 drivers/{staging/media => media/usb}/go7007/go7007.txt            |  0
 drivers/{staging/media => media/usb}/go7007/s2250-board.c         |  9 +++----
 drivers/{staging/media => media/usb}/go7007/saa7134-go7007.c      | 34 +++++++++++---------------
 drivers/{staging/media => media/usb}/go7007/snd-go7007.c          |  4 ---
 drivers/media/v4l2-core/v4l2-ctrls.c                              | 17 ++++++++++---
 drivers/media/v4l2-core/v4l2-ioctl.c                              | 29 +++++++++++++++++-----
 drivers/media/v4l2-core/videobuf2-core.c                          | 78 +++++++++++++++++++++++++++++------------------------------
 drivers/staging/media/Kconfig                                     |  4 ---
 drivers/staging/media/Makefile                                    |  2 --
 include/uapi/linux/videodev2.h                                    |  6 +++++
 49 files changed, 134 insertions(+), 192 deletions(-)
 rename drivers/{staging/media => media/pci}/solo6x10/Kconfig (96%)
 rename drivers/{staging/media => media/pci}/solo6x10/Makefile (82%)
 rename drivers/{staging/media => media/pci}/solo6x10/TODO (100%)
 rename drivers/{staging/media => media/pci}/solo6x10/solo6x10-core.c (98%)
 rename drivers/{staging/media => media/pci}/solo6x10/solo6x10-disp.c (97%)
 rename drivers/{staging/media => media/pci}/solo6x10/solo6x10-eeprom.c (94%)
 rename drivers/{staging/media => media/pci}/solo6x10/solo6x10-enc.c (97%)
 rename drivers/{staging/media => media/pci}/solo6x10/solo6x10-g723.c (98%)
 rename drivers/{staging/media => media/pci}/solo6x10/solo6x10-gpio.c (92%)
 rename drivers/{staging/media => media/pci}/solo6x10/solo6x10-i2c.c (97%)
 rename drivers/{staging/media => media/pci}/solo6x10/solo6x10-jpeg.h (97%)
 rename drivers/{staging/media => media/pci}/solo6x10/solo6x10-offsets.h (93%)
 rename drivers/{staging/media => media/pci}/solo6x10/solo6x10-p2m.c (97%)
 rename drivers/{staging/media => media/pci}/solo6x10/solo6x10-regs.h (99%)
 rename drivers/{staging/media => media/pci}/solo6x10/solo6x10-tw28.c (99%)
 rename drivers/{staging/media => media/pci}/solo6x10/solo6x10-tw28.h (91%)
 rename drivers/{staging/media => media/pci}/solo6x10/solo6x10-v4l2-enc.c (99%)
 rename drivers/{staging/media => media/pci}/solo6x10/solo6x10-v4l2.c (98%)
 rename drivers/{staging/media => media/pci}/solo6x10/solo6x10.h (98%)
 rename drivers/{staging/media => media/usb}/go7007/Kconfig (100%)
 rename drivers/{staging/media => media/usb}/go7007/Makefile (100%)
 rename drivers/{staging/media => media/usb}/go7007/README (99%)
 rename drivers/{staging/media => media/usb}/go7007/go7007-driver.c (98%)
 rename drivers/{staging/media => media/usb}/go7007/go7007-fw.c (99%)
 rename drivers/{staging/media => media/usb}/go7007/go7007-i2c.c (96%)
 rename drivers/{staging/media => media/usb}/go7007/go7007-loader.c (94%)
 rename drivers/{staging/media => media/usb}/go7007/go7007-priv.h (97%)
 rename drivers/{staging/media => media/usb}/go7007/go7007-usb.c (99%)
 rename drivers/{staging/media => media/usb}/go7007/go7007-v4l2.c (99%)
 rename drivers/{staging/media => media/usb}/go7007/go7007.txt (100%)
 rename drivers/{staging/media => media/usb}/go7007/s2250-board.c (98%)
 rename drivers/{staging/media => media/usb}/go7007/saa7134-go7007.c (93%)
 rename drivers/{staging/media => media/usb}/go7007/snd-go7007.c (97%)
#1 lore raw

Em Mon, 21 Jul 2014 16:08:41 +0200
Hans Verkuil <[email protected]> escreveu:

Quoted 42 lines

Hi Mauro,

Here is a set of various fixes: two important ones in v4l2-ioctl and one in vb2. Also some DocBook fixes, a few VBI defines added and documented, a davinci bugfix (reported by the new gcc-4.9 compiler I'm now using for the daily build) and last but not least the move of the solo6x10 and go7007 out of staging into the mainline.

Regards,

Hans

The following changes since commit 0ca1ba2aac5f6b26672099b13040c5b40db93486:

[media] zoran: remove duplicate ZR050_MO_COMP define (2014-07-17 20:07:57 -0300)

are available in the git repository at:

git://linuxtv.org/hverkuil/media_tree.git for-v3.17d

for you to fetch changes up to f50a1bf86405d8377b245145d3e2d1ef5ced6e32:

media: davinci: vpif: fix array out of bound warnings (2014-07-21 16:01:32 +0200)

----------------------------------------------------------------
Hans Verkuil (12):
vb2: fix bytesused == 0 handling
DocBook media: fix incorrect note about packed RGB and colorspace
go7007: update the README, fix checkpatch warnings
go7007: move out of staging into drivers/media/usb.
solo6x10: a few checkpatch fixes
solo6x10: move out of staging into drivers/media/pci. videodev2.h: add defines for the VBI field start lines DocBook media: document new VBI defines
v4l2-ctrls: fix corner case in round-to-range code DocBook media typo
v4l2-ioctl: set V4L2_CAP_EXT_PIX_FORMAT for device_caps
v4l2-ioctl: don't set PRIV_MAGIC unconditionally in g_fmt()

Prabhakar Lad (1):
media: davinci: vpif: fix array out of bound warnings

Quoted 9 lines
 Documentation/DocBook/media/v4l/dev-raw-vbi.xml                   | 12 ++++++---
 Documentation/DocBook/media/v4l/dev-sliced-vbi.xml                |  9 ++++++-
 Documentation/DocBook/media/v4l/pixfmt-packed-rgb.xml             |  3 ---
 Documentation/DocBook/media/v4l/vidioc-queryctrl.xml              |  2 +-
 drivers/media/pci/Kconfig                                         |  1 +
 drivers/media/pci/Makefile                                        |  1 +
 drivers/{staging/media => media/pci}/solo6x10/Kconfig             |  2 +-
 drivers/{staging/media => media/pci}/solo6x10/Makefile            |  2 +-
 drivers/{staging/media => media/pci}/solo6x10/TODO                |  0

This should be removed, after everything there is done.

Quoted 15 lines
 drivers/{staging/media => media/pci}/solo6x10/solo6x10-core.c     |  6 +----
 drivers/{staging/media => media/pci}/solo6x10/solo6x10-disp.c     |  4 ---
 drivers/{staging/media => media/pci}/solo6x10/solo6x10-eeprom.c   |  4 ---
 drivers/{staging/media => media/pci}/solo6x10/solo6x10-enc.c      |  4 ---
 drivers/{staging/media => media/pci}/solo6x10/solo6x10-g723.c     |  4 ---
 drivers/{staging/media => media/pci}/solo6x10/solo6x10-gpio.c     |  4 ---
 drivers/{staging/media => media/pci}/solo6x10/solo6x10-i2c.c      |  4 ---
 drivers/{staging/media => media/pci}/solo6x10/solo6x10-jpeg.h     |  4 ---
 drivers/{staging/media => media/pci}/solo6x10/solo6x10-offsets.h  |  4 ---
 drivers/{staging/media => media/pci}/solo6x10/solo6x10-p2m.c      |  4 ---
 drivers/{staging/media => media/pci}/solo6x10/solo6x10-regs.h     |  4 ---
 drivers/{staging/media => media/pci}/solo6x10/solo6x10-tw28.c     |  5 +---
 drivers/{staging/media => media/pci}/solo6x10/solo6x10-tw28.h     |  4 ---
 drivers/{staging/media => media/pci}/solo6x10/solo6x10-v4l2-enc.c |  7 +++---
 drivers/{staging/media => media/pci}/solo6x10/solo6x10-v4l2.c     |  8 +++---
Quoted 8 lines
 drivers/{staging/media => media/pci}/solo6x10/solo6x10.h          |  4 ---
 drivers/media/platform/davinci/vpif_capture.c                     |  2 +-
 drivers/media/platform/davinci/vpif_display.c                     |  2 +-
 drivers/media/usb/Kconfig                                         |  1 +
 drivers/media/usb/Makefile                                        |  1 +
 drivers/{staging/media => media/usb}/go7007/Kconfig               |  0
 drivers/{staging/media => media/usb}/go7007/Makefile              |  0
 drivers/{staging/media => media/usb}/go7007/README                |  1 -

It seems you forgot this there too.

Quoted 10 lines
 drivers/{staging/media => media/usb}/go7007/go7007-driver.c       |  6 +----
 drivers/{staging/media => media/usb}/go7007/go7007-fw.c           |  4 ---
 drivers/{staging/media => media/usb}/go7007/go7007-i2c.c          |  4 ---
 drivers/{staging/media => media/usb}/go7007/go7007-loader.c       |  4 ---
 drivers/{staging/media => media/usb}/go7007/go7007-priv.h         |  4 ---
 drivers/{staging/media => media/usb}/go7007/go7007-usb.c          |  4 ---
 drivers/{staging/media => media/usb}/go7007/go7007-v4l2.c         |  4 ---
 drivers/{staging/media => media/usb}/go7007/go7007.txt            |  0
 drivers/{staging/media => media/usb}/go7007/s2250-board.c         |  9 +++----
 drivers/{staging/media => media/usb}/go7007/saa7134-go7007.c      | 34 +++++++++++---------------

This driver is not being used, as you forgot to handle it. See README.

I tried to apply the patch there, but the issue is harder, as it tries to call some functions that don't exist at saa7134.

Please fix it before moving the driver out of staging.

Quoted 33 lines
 drivers/{staging/media => media/usb}/go7007/snd-go7007.c          |  4 ---
 drivers/media/v4l2-core/v4l2-ctrls.c                              | 17 ++++++++++---
 drivers/media/v4l2-core/v4l2-ioctl.c                              | 29 +++++++++++++++++-----
 drivers/media/v4l2-core/videobuf2-core.c                          | 78 +++++++++++++++++++++++++++++------------------------------
 drivers/staging/media/Kconfig                                     |  4 ---
 drivers/staging/media/Makefile                                    |  2 --
 include/uapi/linux/videodev2.h                                    |  6 +++++
 49 files changed, 134 insertions(+), 192 deletions(-)
 rename drivers/{staging/media => media/pci}/solo6x10/Kconfig (96%)
 rename drivers/{staging/media => media/pci}/solo6x10/Makefile (82%)
 rename drivers/{staging/media => media/pci}/solo6x10/TODO (100%)
 rename drivers/{staging/media => media/pci}/solo6x10/solo6x10-core.c (98%)
 rename drivers/{staging/media => media/pci}/solo6x10/solo6x10-disp.c (97%)
 rename drivers/{staging/media => media/pci}/solo6x10/solo6x10-eeprom.c (94%)
 rename drivers/{staging/media => media/pci}/solo6x10/solo6x10-enc.c (97%)
 rename drivers/{staging/media => media/pci}/solo6x10/solo6x10-g723.c (98%)
 rename drivers/{staging/media => media/pci}/solo6x10/solo6x10-gpio.c (92%)
 rename drivers/{staging/media => media/pci}/solo6x10/solo6x10-i2c.c (97%)
 rename drivers/{staging/media => media/pci}/solo6x10/solo6x10-jpeg.h (97%)
 rename drivers/{staging/media => media/pci}/solo6x10/solo6x10-offsets.h (93%)
 rename drivers/{staging/media => media/pci}/solo6x10/solo6x10-p2m.c (97%)
 rename drivers/{staging/media => media/pci}/solo6x10/solo6x10-regs.h (99%)
 rename drivers/{staging/media => media/pci}/solo6x10/solo6x10-tw28.c (99%)
 rename drivers/{staging/media => media/pci}/solo6x10/solo6x10-tw28.h (91%)
 rename drivers/{staging/media => media/pci}/solo6x10/solo6x10-v4l2-enc.c (99%)
 rename drivers/{staging/media => media/pci}/solo6x10/solo6x10-v4l2.c (98%)
 rename drivers/{staging/media => media/pci}/solo6x10/solo6x10.h (98%)
 rename drivers/{staging/media => media/usb}/go7007/Kconfig (100%)
 rename drivers/{staging/media => media/usb}/go7007/Makefile (100%)
 rename drivers/{staging/media => media/usb}/go7007/README (99%)
 rename drivers/{staging/media => media/usb}/go7007/go7007-driver.c (98%)
 rename drivers/{staging/media => media/usb}/go7007/go7007-fw.c (99%)
 rename drivers/{staging/media => media/usb}/go7007/go7007-i2c.c (96%)
Quoted 8 lines
 rename drivers/{staging/media => media/usb}/go7007/go7007-loader.c (94%)
 rename drivers/{staging/media => media/usb}/go7007/go7007-priv.h (97%)
 rename drivers/{staging/media => media/usb}/go7007/go7007-usb.c (99%)
 rename drivers/{staging/media => media/usb}/go7007/go7007-v4l2.c (99%)
 rename drivers/{staging/media => media/usb}/go7007/go7007.txt (100%)
 rename drivers/{staging/media => media/usb}/go7007/s2250-board.c (98%)
 rename drivers/{staging/media => media/usb}/go7007/saa7134-go7007.c (93%)
 rename drivers/{staging/media => media/usb}/go7007/snd-go7007.c (97%)

I'll apply the patches that don't depend on the rename.

Quoted 4 lines

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html