A bunch of

GIT PULL Hans Verkuil 2 participants 4 messages Jul 17, 2014 Media (V4L/DVB)

lore

Share & tools

lore

Hans Verkuil

author

2014-07-17 08:09 UTC #0 lore raw

These are all little fixes for issues I found while working on the vivi replacement + some docbook fixes.

Usually all for fairly obscure corner cases, but that's what you write a test driver for, after all.

Regards,

Hans

The following changes since commit 3c0d394ea7022bb9666d9df97a5776c4bcc3045c:

[media] dib8000: improve the message that reports per-layer locks (2014-07-07 09:59:01 -0300)

are available in the git repository at:

git://linuxtv.org/hverkuil/media_tree.git core-fixes

for you to fetch changes up to 2eb86fa0840ac281cc5ca0a63f1339fa00245c7d:

v4l2-ioctl.c: check vfl_type in ENUM_FMT. (2014-07-14 14:55:47 +0200)

----------------------------------------------------------------
Hans Verkuil (12):
DocBook media: fix wrong spacing
DocBook media: add missing dqevent src_change field. DocBook media: fix incorrect header reference
v4l2-ioctl: call g_selection before calling cropcap
v4l2-ioctl: clips, clipcount and bitmap should not be zeroed.
v4l2-ioctl: clear reserved field of G/S_SELECTION.
v4l2-ioctl: remove pointless INFO_FL_CLEAR.
v4l2-dev: don't debug poll unless the debug level > 2 videodev2.h: add V4L2_FIELD_HAS_T_OR_B macro
v4l2-dev: streamon/off is only a valid ioctl for video, vbi and sdr v4l2-ioctl.c: fix enum_freq_bands handling v4l2-ioctl.c: check vfl_type in ENUM_FMT.

 Documentation/DocBook/media/v4l/pixfmt.xml             |   2 +-
 Documentation/DocBook/media/v4l/selection-api.xml      |  95 ++++++++++++++++++++++++++++++++-------------------------------
 Documentation/DocBook/media/v4l/vidioc-dqevent.xml     |   6 ++++
 Documentation/DocBook/media/v4l/vidioc-g-selection.xml |  40 +++++++++++++--------------
 drivers/media/v4l2-core/v4l2-dev.c                     |   6 ++--
 drivers/media/v4l2-core/v4l2-ioctl.c                   | 103 +++++++++++++++++++++++++++++++++++++++++++++------------------------
 include/uapi/linux/videodev2.h                         |   4 +++
 7 files changed, 148 insertions(+), 108 deletions(-)

Hans Verkuil

author

2014-07-17 08:13 UTC #1 lore raw

OK, so the full subject line should have been:

A bunch of little v4l2 core fixes

:-)

Hans

Quoted 50 lines · Hans Verkuil

These are all little fixes for issues I found while working on the vivi replacement + some docbook fixes.
Usually all for fairly obscure corner cases, but that's what you write a test driver for, after all.
Regards,
Hans
The following changes since commit 3c0d394ea7022bb9666d9df97a5776c4bcc3045c:
[media] dib8000: improve the message that reports per-layer locks (2014-07-07 09:59:01 -0300)
are available in the git repository at:
git://linuxtv.org/hverkuil/media_tree.git core-fixes
for you to fetch changes up to 2eb86fa0840ac281cc5ca0a63f1339fa00245c7d:
v4l2-ioctl.c: check vfl_type in ENUM_FMT. (2014-07-14 14:55:47 +0200)
----------------------------------------------------------------
Hans Verkuil (12):
DocBook media: fix wrong spacing
DocBook media: add missing dqevent src_change field. DocBook media: fix incorrect header reference
v4l2-ioctl: call g_selection before calling cropcap
v4l2-ioctl: clips, clipcount and bitmap should not be zeroed.
v4l2-ioctl: clear reserved field of G/S_SELECTION.
v4l2-ioctl: remove pointless INFO_FL_CLEAR.
v4l2-dev: don't debug poll unless the debug level > 2 videodev2.h: add V4L2_FIELD_HAS_T_OR_B macro
v4l2-dev: streamon/off is only a valid ioctl for video, vbi and sdr v4l2-ioctl.c: fix enum_freq_bands handling v4l2-ioctl.c: check vfl_type in ENUM_FMT.
 Documentation/DocBook/media/v4l/pixfmt.xml             |   2 +-
 Documentation/DocBook/media/v4l/selection-api.xml      |  95 ++++++++++++++++++++++++++++++++-------------------------------
 Documentation/DocBook/media/v4l/vidioc-dqevent.xml     |   6 ++++
 Documentation/DocBook/media/v4l/vidioc-g-selection.xml |  40 +++++++++++++--------------
 drivers/media/v4l2-core/v4l2-dev.c                     |   6 ++--
 drivers/media/v4l2-core/v4l2-ioctl.c                   | 103 +++++++++++++++++++++++++++++++++++++++++++++------------------------
 include/uapi/linux/videodev2.h                         |   4 +++
 7 files changed, 148 insertions(+), 108 deletions(-)
--
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

Mauro Carvalho Chehab

2014-07-17 21:43 UTC #2 lore raw

In reply to Hans Verkuil

Em Thu, 17 Jul 2014 10:09:40 +0200
Hans Verkuil <[email protected]> escreveu:

Quoted 22 lines

These are all little fixes for issues I found while working on the vivi replacement + some docbook fixes.
Usually all for fairly obscure corner cases, but that's what you write a test driver for, after all.
Regards,
Hans
The following changes since commit 3c0d394ea7022bb9666d9df97a5776c4bcc3045c:
[media] dib8000: improve the message that reports per-layer locks (2014-07-07 09:59:01 -0300)
are available in the git repository at:
git://linuxtv.org/hverkuil/media_tree.git core-fixes
for you to fetch changes up to 2eb86fa0840ac281cc5ca0a63f1339fa00245c7d:
v4l2-ioctl.c: check vfl_type in ENUM_FMT. (2014-07-14 14:55:47 +0200)

Quoted 7 lines

----------------------------------------------------------------
Hans Verkuil (12):
DocBook media: fix wrong spacing
DocBook media: add missing dqevent src_change field. DocBook media: fix incorrect header reference
v4l2-ioctl: call g_selection before calling cropcap
v4l2-ioctl: clips, clipcount and bitmap should not be zeroed.

This one causes compilation breakages:

drivers/media/v4l2-core/v4l2-ioctl.c: In function 'v4l_enum_fmt':
drivers/media/v4l2-core/v4l2-ioctl.c:1115:30: error: 'struct v4l2_fmtdesc' has no member named 'fmt'

   struct v4l2_clip *clips = p->fmt.win.clips;
                              ^
drivers/media/v4l2-core/v4l2-ioctl.c:1116:20: error: 'struct v4l2_fmtdesc' has no member named 'fmt'
   u32 clipcount = p->fmt.win.clipcount;
                    ^
drivers/media/v4l2-core/v4l2-ioctl.c:1117:19: error: 'struct v4l2_fmtdesc' has no member named 'fmt'
   void *bitmap = p->fmt.win.bitmap;
                   ^
In file included from ./arch/x86/include/asm/string.h:2:0,
                 from include/linux/string.h:17,
                 from ./arch/x86/include/asm/page_32.h:34,
                 from ./arch/x86/include/asm/page.h:13,
                 from ./arch/x86/include/asm/thread_info.h:11,
                 from include/linux/thread_info.h:54,
                 from ./arch/x86/include/asm/preempt.h:6,
                 from include/linux/preempt.h:18,
                 from include/linux/spinlock.h:50,
                 from include/linux/seqlock.h:35,
                 from include/linux/time.h:5,
                 from include/linux/stat.h:18,
                 from include/linux/module.h:10,
                 from drivers/media/v4l2-core/v4l2-ioctl.c:15:
drivers/media/v4l2-core/v4l2-ioctl.c:1119:12: error: 'struct v4l2_fmtdesc' has no member named 'fmt'
   memset(&p->fmt, 0, sizeof(p->fmt));
            ^
./arch/x86/include/asm/string_32.h:325:46: note: in definition of macro 'memset'
 #define memset(s, c, count) __builtin_memset(s, c, count)
                                              ^
drivers/media/v4l2-core/v4l2-ioctl.c:1119:30: error: 'struct v4l2_fmtdesc' has no member named 'fmt'
   memset(&p->fmt, 0, sizeof(p->fmt));
                              ^
./arch/x86/include/asm/string_32.h:325:52: note: in definition of macro 'memset'
 #define memset(s, c, count) __builtin_memset(s, c, count)
                                                    ^
drivers/media/v4l2-core/v4l2-ioctl.c:1120:4: error: 'struct v4l2_fmtdesc' has no member named 'fmt'
   p->fmt.win.clips = clips;
    ^
drivers/media/v4l2-core/v4l2-ioctl.c:1121:4: error: 'struct v4l2_fmtdesc' has no member named 'fmt'
   p->fmt.win.clipcount = clipcount;
    ^
drivers/media/v4l2-core/v4l2-ioctl.c:1122:4: error: 'struct v4l2_fmtdesc' has no member named 'fmt'
   p->fmt.win.bitmap = bitmap;
    ^
In file included from ./arch/x86/include/asm/string.h:2:0,
                 from include/linux/string.h:17,
                 from ./arch/x86/include/asm/page_32.h:34,
                 from ./arch/x86/include/asm/page.h:13,
                 from ./arch/x86/include/asm/thread_info.h:11,
                 from include/linux/thread_info.h:54,
                 from ./arch/x86/include/asm/preempt.h:6,
                 from include/linux/preempt.h:18,
                 from include/linux/spinlock.h:50,
                 from include/linux/seqlock.h:35,
                 from include/linux/time.h:5,
                 from include/linux/stat.h:18,
                 from include/linux/module.h:10,
                 from drivers/media/v4l2-core/v4l2-ioctl.c:15:
drivers/media/v4l2-core/v4l2-ioctl.c:1126:12: error: 'struct v4l2_fmtdesc' has no member named 'fmt'
   memset(&p->fmt, 0, sizeof(p->fmt));
            ^
./arch/x86/include/asm/string_32.h:325:46: note: in definition of macro 'memset'
 #define memset(s, c, count) __builtin_memset(s, c, count)
                                              ^
drivers/media/v4l2-core/v4l2-ioctl.c:1126:30: error: 'struct v4l2_fmtdesc' has no member named 'fmt'
   memset(&p->fmt, 0, sizeof(p->fmt));
                              ^
./arch/x86/include/asm/string_32.h:325:52: note: in definition of macro 'memset'
 #define memset(s, c, count) __builtin_memset(s, c, count)
                                                    ^

make[2]: *** [drivers/media/v4l2-core/v4l2-ioctl.o] Error 1 make[1]: *** [drivers/media/v4l2-core] Error 2
make: *** [_module_drivers/media] Error 2

Dropped it and applied the remaining patches.

Regards,
Mauro

Hans Verkuil

author

2014-07-17 21:47 UTC #3 lore raw

Quoted 33 lines · Mauro Carvalho Chehab

Em Thu, 17 Jul 2014 10:09:40 +0200
Hans Verkuil <[email protected]> escreveu:
Quoted 22 lines
These are all little fixes for issues I found while working on the vivi replacement + some docbook fixes.
Usually all for fairly obscure corner cases, but that's what you write a test driver for, after all.
Regards,
Hans
The following changes since commit 3c0d394ea7022bb9666d9df97a5776c4bcc3045c:
[media] dib8000: improve the message that reports per-layer locks (2014-07-07 09:59:01 -0300)
are available in the git repository at:
git://linuxtv.org/hverkuil/media_tree.git core-fixes
for you to fetch changes up to 2eb86fa0840ac281cc5ca0a63f1339fa00245c7d:
v4l2-ioctl.c: check vfl_type in ENUM_FMT. (2014-07-14 14:55:47 +0200)
Quoted 7 lines
----------------------------------------------------------------
Hans Verkuil (12):
DocBook media: fix wrong spacing
DocBook media: add missing dqevent src_change field. DocBook media: fix incorrect header reference
v4l2-ioctl: call g_selection before calling cropcap
v4l2-ioctl: clips, clipcount and bitmap should not be zeroed.

Quoted 1 line

This one causes compilation breakages:

It clearly got misapplied. I've posted the rebased patch to the mailinglist.

Regards,

Hans

Quoted 85 lines

drivers/media/v4l2-core/v4l2-ioctl.c: In function 'v4l_enum_fmt':
drivers/media/v4l2-core/v4l2-ioctl.c:1115:30: error: 'struct v4l2_fmtdesc' has no member named 'fmt'

   struct v4l2_clip *clips = p->fmt.win.clips;
                              ^
drivers/media/v4l2-core/v4l2-ioctl.c:1116:20: error: 'struct v4l2_fmtdesc' has no member named 'fmt'
   u32 clipcount = p->fmt.win.clipcount;
                    ^
drivers/media/v4l2-core/v4l2-ioctl.c:1117:19: error: 'struct v4l2_fmtdesc' has no member named 'fmt'
   void *bitmap = p->fmt.win.bitmap;
                   ^
In file included from ./arch/x86/include/asm/string.h:2:0,
                 from include/linux/string.h:17,
                 from ./arch/x86/include/asm/page_32.h:34,
                 from ./arch/x86/include/asm/page.h:13,
                 from ./arch/x86/include/asm/thread_info.h:11,
                 from include/linux/thread_info.h:54,
                 from ./arch/x86/include/asm/preempt.h:6,
                 from include/linux/preempt.h:18,
                 from include/linux/spinlock.h:50,
                 from include/linux/seqlock.h:35,
                 from include/linux/time.h:5,
                 from include/linux/stat.h:18,
                 from include/linux/module.h:10,
                 from drivers/media/v4l2-core/v4l2-ioctl.c:15:
drivers/media/v4l2-core/v4l2-ioctl.c:1119:12: error: 'struct v4l2_fmtdesc' has no member named 'fmt'
   memset(&p->fmt, 0, sizeof(p->fmt));
            ^
./arch/x86/include/asm/string_32.h:325:46: note: in definition of macro 'memset'
 #define memset(s, c, count) __builtin_memset(s, c, count)
                                              ^
drivers/media/v4l2-core/v4l2-ioctl.c:1119:30: error: 'struct v4l2_fmtdesc' has no member named 'fmt'
   memset(&p->fmt, 0, sizeof(p->fmt));
                              ^
./arch/x86/include/asm/string_32.h:325:52: note: in definition of macro 'memset'
 #define memset(s, c, count) __builtin_memset(s, c, count)
                                                    ^
drivers/media/v4l2-core/v4l2-ioctl.c:1120:4: error: 'struct v4l2_fmtdesc' has no member named 'fmt'
   p->fmt.win.clips = clips;
    ^
drivers/media/v4l2-core/v4l2-ioctl.c:1121:4: error: 'struct v4l2_fmtdesc' has no member named 'fmt'
   p->fmt.win.clipcount = clipcount;
    ^
drivers/media/v4l2-core/v4l2-ioctl.c:1122:4: error: 'struct v4l2_fmtdesc' has no member named 'fmt'
   p->fmt.win.bitmap = bitmap;
    ^
In file included from ./arch/x86/include/asm/string.h:2:0,
                 from include/linux/string.h:17,
                 from ./arch/x86/include/asm/page_32.h:34,
                 from ./arch/x86/include/asm/page.h:13,
                 from ./arch/x86/include/asm/thread_info.h:11,
                 from include/linux/thread_info.h:54,
                 from ./arch/x86/include/asm/preempt.h:6,
                 from include/linux/preempt.h:18,
                 from include/linux/spinlock.h:50,
                 from include/linux/seqlock.h:35,
                 from include/linux/time.h:5,
                 from include/linux/stat.h:18,
                 from include/linux/module.h:10,
                 from drivers/media/v4l2-core/v4l2-ioctl.c:15:
drivers/media/v4l2-core/v4l2-ioctl.c:1126:12: error: 'struct v4l2_fmtdesc' has no member named 'fmt'
   memset(&p->fmt, 0, sizeof(p->fmt));
            ^
./arch/x86/include/asm/string_32.h:325:46: note: in definition of macro 'memset'
 #define memset(s, c, count) __builtin_memset(s, c, count)
                                              ^
drivers/media/v4l2-core/v4l2-ioctl.c:1126:30: error: 'struct v4l2_fmtdesc' has no member named 'fmt'
   memset(&p->fmt, 0, sizeof(p->fmt));
                              ^
./arch/x86/include/asm/string_32.h:325:52: note: in definition of macro 'memset'
 #define memset(s, c, count) __builtin_memset(s, c, count)
                                                    ^

make[2]: *** [drivers/media/v4l2-core/v4l2-ioctl.o] Error 1 make[1]: *** [drivers/media/v4l2-core] Error 2
make: *** [_module_drivers/media] Error 2

Dropped it and applied the remaining patches.

Regards,
Mauro
--
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