VIDEO_OMAP2_VOUT broken

2011-08-27 Thread Arnd Bergmann
Hi Tomi,

Apparently your patch 8cff88c5d "OMAP: DSS2: remove update_mode from omapdss"
broke building the omap_vout driver:

/home/arnd/linux-arm/drivers/media/video/omap/omap_vout.c: In function 
'omap_vout_probe':
/home/arnd/linux-arm/drivers/media/video/omap/omap_vout.c:2202:15: error: 
'struct omap_dss_driver' has no member 
named 'set_update_mode'
/home/arnd/linux-arm/drivers/media/video/omap/omap_vout.c:2203:12: error: 
'struct omap_dss_driver' has no member 
named 'set_update_mode'
/home/arnd/linux-arm/drivers/media/video/omap/omap_vout.c:2204:8: error: 
'OMAP_DSS_UPDATE_MANUAL' undeclared (first 
use in this function)
/home/arnd/linux-arm/drivers/media/video/omap/omap_vout.c:2204:8: note: each 
undeclared identifier is reported only 
once for each function it appears in
/home/arnd/linux-arm/drivers/media/video/omap/omap_vout.c:2206:15: error: 
'struct omap_dss_driver' has no member 
named 'set_update_mode'
/home/arnd/linux-arm/drivers/media/video/omap/omap_vout.c:2207:12: error: 
'struct omap_dss_driver' has no member 
named 'set_update_mode'
/home/arnd/linux-arm/drivers/media/video/omap/omap_vout.c:2208:8: error: 
'OMAP_DSS_UPDATE_AUTO' undeclared (first use 
in this function)
make[3]: *** [drivers/media/video/omap/omap_vout.o] Error 1
make[2]: *** [drivers/media/video/omap] Error 2
make[1]: *** [drivers/media/video/] Error 2
make: *** [sub-make] Error 2

I've disabled the driver for now in my tree, but I guess this should be
addressed before 3.1.

Arnd
--
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


[cron job] v4l-dvb daily build: ERRORS

2011-08-27 Thread Hans Verkuil
This message is generated daily by a cron job that builds v4l-dvb for
the kernels and architectures in the list below.

Results of the daily build of v4l-dvb:

date:Sat Aug 27 19:06:59 CEST 2011
git hash:c9f88aa976b79a26561fb7754a1e0e00ff7626fe
gcc version:  i686-linux-gcc (GCC) 4.6.1
host hardware:x86_64
host os:  2.6.32.5

linux-git-armv5: WARNINGS
linux-git-armv5-davinci: WARNINGS
linux-git-armv5-ixp: WARNINGS
linux-git-armv5-omap2: WARNINGS
linux-git-i686: WARNINGS
linux-git-m32r: OK
linux-git-mips: WARNINGS
linux-git-powerpc64: WARNINGS
linux-git-x86_64: WARNINGS
linux-2.6.31.12-i686: ERRORS
linux-2.6.32.6-i686: ERRORS
linux-2.6.33-i686: ERRORS
linux-2.6.34-i686: ERRORS
linux-2.6.35.3-i686: ERRORS
linux-2.6.36-i686: WARNINGS
linux-2.6.37-i686: WARNINGS
linux-2.6.38.2-i686: WARNINGS
linux-2.6.39.1-i686: WARNINGS
linux-3.0-i686: WARNINGS
linux-3.1-rc1-i686: WARNINGS
linux-2.6.31.12-x86_64: ERRORS
linux-2.6.32.6-x86_64: ERRORS
linux-2.6.33-x86_64: ERRORS
linux-2.6.34-x86_64: ERRORS
linux-2.6.35.3-x86_64: ERRORS
linux-2.6.36-x86_64: WARNINGS
linux-2.6.37-x86_64: WARNINGS
linux-2.6.38.2-x86_64: WARNINGS
linux-2.6.39.1-x86_64: WARNINGS
linux-3.0-x86_64: WARNINGS
linux-3.1-rc1-x86_64: WARNINGS
spec-git: WARNINGS
sparse: ERRORS

Detailed results are available here:

http://www.xs4all.nl/~hverkuil/logs/Saturday.log

Full logs are available here:

http://www.xs4all.nl/~hverkuil/logs/Saturday.tar.bz2

The V4L-DVB specification from this daily build is here:

http://www.xs4all.nl/~hverkuil/spec/media.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


Re: [PATCH 06/14] [media] cx18: Use current logging styles

2011-08-27 Thread Joe Perches
On Sat, 2011-08-27 at 19:05 +0200, Jean-Francois Moine wrote:
> On Sat, 27 Aug 2011 09:42:32 -0700
> Joe Perches  wrote:
> 
> > Andy, I fully understand how this stuff works.
> > You apparently don't (yet).
> > 
> > Look at include/linux/printk.h
> > 
> > #ifndef pr_fmt
> > #define pr_fmt(fmt) fmt
> > #endif
> > 
> > A default empty define is used when one
> > is not specified before printk.h is
> > included.  kernel.h includes printk.h
> 
> Hi Joe,
> 
> Yes, but, what if pr_fmt is redefined in some driver specific include
> by:
> 
> #undef pr_fmt
> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

Of course that's possible.

But any pr_ that is used by any .h file
that is included before this redefine like
for instance netdevice.h doesn't have a
properly specified pr_fmt.


--
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: [PATCH 06/14] [media] cx18: Use current logging styles

2011-08-27 Thread Andy Walls
Joe Perches  wrote:

>On Sat, 2011-08-27 at 09:28 -0400, Andy Walls wrote:
>> On Wed, 2011-08-24 at 14:42 -0700, Joe Perches wrote:
>> > On Wed, 2011-08-24 at 06:34 -0400, Andy Walls wrote:
>> > > On Sun, 2011-08-21 at 15:56 -0700, Joe Perches wrote:
>> > > > Add pr_fmt.
>> > > > Convert printks to pr_.
>> > > > Convert printks without KERN_ to appropriate pr_.
>> > > > Removed embedded prefixes when pr_fmt was added.
>> > > > Use ##__VA_ARGS__ for variadic macros.
>> > > > Coalesce format strings.
>> > > 1. It is important to preserve the per-card prefixes emitted by
>the
>> > > driver: cx18-0, cx18-1, cx18-2, etc.  With a quick skim, I think
>your
>> > > change preserves the format of all output messages (except
>removing
>> > > periods).  Can you confirm this?
>> > Here's the output diff of
>> > strings built-in.o | grep "^<.>" | sort
>> > new and old
>[]
>> Yuck.
>> > > 2. PLease don't add a pr_fmt() #define to exevry file.  Just put
>one
>> > > where all the other CX18_*() macros are defined.  Every file
>picks those
>> > > up.
>> > It's not the first #include of every file.
>> > printk.h has a default #define pr_fmt(fmt) fmt
>> Well then don't use "pr_fmt(fmt)" in cx18, if it overloads a define
>> somewhere else in the kernel and has a dependency on its order
>relative
>> to #include statements.  That sort of thing just ups maintenance
>hours
>> later.  That's not a good trade off for subjectively better log
>> messages.
>> Won't redifining the 'pr_fmt(fmt)' generate preprocessor warnings
>> anyway?
>
>No.
>
>Andy, I fully understand how this stuff works.
>You apparently don't (yet).
>
>Look at include/linux/printk.h
>
>#ifndef pr_fmt
>#define pr_fmt(fmt) fmt
>#endif
>
>A default empty define is used when one
>is not specified before printk.h is
>included.  kernel.h includes printk.h
>
>v4l2_ uses the "name" of the video
>device in its output.  That name may not
>be the same name as the module.
>
>--
>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

Hi Joe,

I don't need to fully understand it.

This is a happy to glad change with no functional nor performance benefit.  It 
adds unneeded lines of code to the driver and mangles some of the log messages.

I see no benefit from my perspective.

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: [PATCH 06/14] [media] cx18: Use current logging styles

2011-08-27 Thread Jean-Francois Moine
On Sat, 27 Aug 2011 09:42:32 -0700
Joe Perches  wrote:

> Andy, I fully understand how this stuff works.
> You apparently don't (yet).
> 
> Look at include/linux/printk.h
> 
> #ifndef pr_fmt
> #define pr_fmt(fmt) fmt
> #endif
> 
> A default empty define is used when one
> is not specified before printk.h is
> included.  kernel.h includes printk.h

Hi Joe,

Yes, but, what if pr_fmt is redefined in some driver specific include
by:

#undef pr_fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

(in gspca.h for example) ?

-- 
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: [PATCH 06/14] [media] cx18: Use current logging styles

2011-08-27 Thread Joe Perches
On Sat, 2011-08-27 at 09:28 -0400, Andy Walls wrote:
> On Wed, 2011-08-24 at 14:42 -0700, Joe Perches wrote:
> > On Wed, 2011-08-24 at 06:34 -0400, Andy Walls wrote:
> > > On Sun, 2011-08-21 at 15:56 -0700, Joe Perches wrote:
> > > > Add pr_fmt.
> > > > Convert printks to pr_.
> > > > Convert printks without KERN_ to appropriate pr_.
> > > > Removed embedded prefixes when pr_fmt was added.
> > > > Use ##__VA_ARGS__ for variadic macros.
> > > > Coalesce format strings.
> > > 1. It is important to preserve the per-card prefixes emitted by the
> > > driver: cx18-0, cx18-1, cx18-2, etc.  With a quick skim, I think your
> > > change preserves the format of all output messages (except removing
> > > periods).  Can you confirm this?
> > Here's the output diff of
> > strings built-in.o | grep "^<.>" | sort
> > new and old
[]
> Yuck.
> > > 2. PLease don't add a pr_fmt() #define to exevry file.  Just put one
> > > where all the other CX18_*() macros are defined.  Every file picks those
> > > up.
> > It's not the first #include of every file.
> > printk.h has a default #define pr_fmt(fmt) fmt
> Well then don't use "pr_fmt(fmt)" in cx18, if it overloads a define
> somewhere else in the kernel and has a dependency on its order relative
> to #include statements.  That sort of thing just ups maintenance hours
> later.  That's not a good trade off for subjectively better log
> messages.
> Won't redifining the 'pr_fmt(fmt)' generate preprocessor warnings
> anyway?

No.

Andy, I fully understand how this stuff works.
You apparently don't (yet).

Look at include/linux/printk.h

#ifndef pr_fmt
#define pr_fmt(fmt) fmt
#endif

A default empty define is used when one
is not specified before printk.h is
included.  kernel.h includes printk.h

v4l2_ uses the "name" of the video
device in its output.  That name may not
be the same name as the module.

--
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


s2 question

2011-08-27 Thread morganadelsol
Why the linux4media cine s2 twin tunner Tv card is not listed in as fully
linux supported?

http://linuxtv.org/wiki/index.php/DVB-S2_PCIe_Cards

Here you seem to say that yes it is fully supported, or not?:

http://linuxtv.org/wiki/index.php/Linux4Media_cineS2_DVB-S2_Twin_Tuner

Thank you.

Y.


--
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: radio-si470x-usb.c warning: can I remove 'buf'?

2011-08-27 Thread Hans Verkuil
On Friday, August 26, 2011 21:03:53 Tobias Lorenz wrote:
> Hi Hans,
> 
> > While going through the compile warnings generated in the daily build I
> > came
> > across this one:
> > 
> > v4l-dvb-git/drivers/media/radio/si470x/radio-si470x-usb.c: In function
> > 'si470x_int_in_callback':
> > v4l-dvb-git/drivers/media/radio/si470x/radio-si470x-usb.c:398:16:
> warning:
> > variable 'buf' set but not used [-Wunused-but-set-variable]
> > 
> > The 'unsigned char buf[RDS_REPORT_SIZE];' is indeed unused, but can I
> just
> > remove it? There is this single assignment to buf: 'buf[0] =
> RDS_REPORT;'.
> > 
> > This makes me wonder if it is perhaps supposed to be used after all.
> > 
> > Please let me know if I can remove it, or if it is a bug that someone
> needs
> > to fix.
> 
> this is an artifact from shifting the rds processing function into
> interrupt context.
> Yes, this can safely be removed.
> 
> Can you do this?

Will do. I've just posted a pull request that includes this fix.

Regards,

Hans
--
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 3.2] First round of compiler warning fixes

2011-08-27 Thread Hans Verkuil
The following changes since commit 9bed77ee2fb46b74782d0d9d14b92e9d07f3df6e:

  [media] tuner_xc2028: Allow selection of the frequency adjustment code for 
XC3028 (2011-08-06 09:52:47 -0300)

are available in the git repository at:
  ssh://linuxtv.org/git/hverkuil/media_tree.git fixes

Hans Verkuil (14):
  radio-si4713.c: fix compiler warning
  mt20xx.c: fix compiler warnings
  wl128x: fix compiler warning + wrong write() return.
  saa7146: fix compiler warning
  ddbridge: fix compiler warnings
  mxl5005s: fix compiler warning
  af9005-fe: fix compiler warning
  tvaudio: fix compiler warnings
  az6027: fix compiler warnings
  mantis: fix compiler warnings
  drxd_hard: fix compiler warnings
  vpx3220, bt819: fix compiler warnings
  si470x: fix compile warning.
  dvb_frontend: fix compile warning.

 drivers/media/common/saa7146_video.c  |   12 
 drivers/media/common/tuners/mt20xx.c  |   24 +++-
 drivers/media/common/tuners/mxl5005s.c|   22 ++
 drivers/media/dvb/ddbridge/ddbridge-core.c|9 ++---
 drivers/media/dvb/dvb-core/dvb_frontend.c |3 +--
 drivers/media/dvb/dvb-usb/af9005-fe.c |2 --
 drivers/media/dvb/dvb-usb/az6027.c|   12 +---
 drivers/media/dvb/frontends/drxd_hard.c   |   11 ++-
 drivers/media/dvb/mantis/hopper_cards.c   |4 ++--
 drivers/media/dvb/mantis/mantis_cards.c   |4 ++--
 drivers/media/radio/radio-si4713.c|4 
 drivers/media/radio/si470x/radio-si470x-usb.c |2 --
 drivers/media/radio/wl128x/fmdrv_v4l2.c   |4 +++-
 drivers/media/video/bt819.c   |2 +-
 drivers/media/video/tvaudio.c |9 ++---
 drivers/media/video/vpx3220.c |2 +-
 16 files changed, 58 insertions(+), 68 deletions(-)
--
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: [PATCH 06/14] [media] cx18: Use current logging styles

2011-08-27 Thread Andy Walls
On Wed, 2011-08-24 at 14:42 -0700, Joe Perches wrote:
> On Wed, 2011-08-24 at 06:34 -0400, Andy Walls wrote:
> > On Sun, 2011-08-21 at 15:56 -0700, Joe Perches wrote:
> > > Add pr_fmt.
> > > Convert printks to pr_.
> > > Convert printks without KERN_ to appropriate pr_.
> > > Removed embedded prefixes when pr_fmt was added.
> > > Use ##__VA_ARGS__ for variadic macros.
> > > Coalesce format strings.
> > 1. It is important to preserve the per-card prefixes emitted by the
> > driver: cx18-0, cx18-1, cx18-2, etc.  With a quick skim, I think your
> > change preserves the format of all output messages (except removing
> > periods).  Can you confirm this?
> 
> Here's the output diff of
> strings built-in.o | grep "^<.>" | sort
> new and old
> $ diff -u0 cx18.old cx18.new
> --- cx18.old  2011-08-24 13:18:41.0 -0700
> +++ cx18.new  2011-08-24 14:04:10.0 -0700
> @@ -1,2 +1,9 @@
> -<3>cx18-alsa cx is NULL
> -<3>cx18-alsa: %s: struct v4l2_device * is NULL
> +<3>cx18_alsa: cx is NULL
> +<3>cx18_alsa: %s-alsa: %s: failed to create struct snd_cx18_card
> +<3>cx18_alsa: %s-alsa: %s: snd_card_create() failed with err %d
> +<3>cx18_alsa: %s-alsa: %s: snd_card_register() failed with err %d
> +<3>cx18_alsa: %s-alsa: %s: snd_cx18_card_create() failed with err %d
> +<3>cx18_alsa: %s-alsa: %s: snd_cx18_pcm_create() failed with err %d
> +<3>cx18_alsa: %s-alsa: %s: snd_cx18_pcm_create() failed with err %d
> +<3>cx18_alsa: %s-alsa: %s: struct snd_cx18_card * already exists
> +<3>cx18_alsa: %s: struct v4l2_device * is NULL
> @@ -17,7 +23,0 @@
> -<3>%s-alsa: %s: failed to create struct snd_cx18_card
> -<3>%s-alsa: %s: snd_card_create() failed with err %d
> -<3>%s-alsa: %s: snd_card_register() failed with err %d
> -<3>%s-alsa: %s: snd_cx18_card_create() failed with err %d
> -<3>%s-alsa: %s: snd_cx18_pcm_create() failed with err %d
> -<3>%s-alsa: %s: snd_cx18_pcm_create() failed with err %d
> -<3>%s-alsa: %s: struct snd_cx18_card * already exists

Yuck.

> @@ -62 +62 @@
> -<3>%s: Prefix your subject line with [UNKNOWN CX18 CARD].
> +<3>%s: Prefix your subject line with [UNKNOWN CX18 CARD]

> @@ -80 +80 @@
> -<4>%s-alsa: %s: struct snd_cx18_card * is NULL
> +<4>cx18_alsa: %s-alsa: %s: struct snd_cx18_card * is NULL

Yuck.

> @@ -82 +82 @@
> -<4>%s: Could not register GPIO reset controllersubdevice; proceeding anyway.
> +<4>%s: Could not register GPIO reset controller subdevice; proceeding anyway.
> @@ -85 +85 @@
> -<4>%s: MPEG Index stream cannot be claimed directly, but something tried.
> +<4>%s: MPEG Index stream cannot be claimed directly, but something tried
> @@ -99,12 +99,14 @@
> -<6>cx18-alsa: module loading...
> -<6>cx18-alsa: module unload complete
> -<6>cx18-alsa: module unloading...
> -<6>cx18-alsa-pcm %s: Allocating vbuffer
> -<6>cx18-alsa-pcm %s: cx18 alsa announce ptr=%p data=%p num_bytes=%zd
> -<6>cx18-alsa-pcm %s: dma area was NULL - ignoring
> -<6>cx18-alsa-pcm %s: freeing pcm capture region
> -<6>cx18-alsa-pcm %s: runtime was NULL
> -<6>cx18-alsa-pcm %s: %s called
> -<6>cx18-alsa-pcm %s: %s: length was zero
> -<6>cx18-alsa-pcm %s: stride is zero
> -<6>cx18-alsa-pcm %s: substream was NULL
> +<6>cx18_alsa: module loading...
> +<6>cx18_alsa: module unload complete
> +<6>cx18_alsa: module unloading...
> +<6>cx18_alsa: %s: Allocating vbuffer
> +<6>cx18_alsa: %s: created cx18 ALSA interface instance 
> +<6>cx18_alsa: %s: cx18 alsa announce ptr=%p data=%p num_bytes=%zd
> +<6>cx18_alsa: %s: dma area was NULL - ignoring
> +<6>cx18_alsa: %s: freeing pcm capture region
> +<6>cx18_alsa: %s: PCM stream for card is disabled - skipping
> +<6>cx18_alsa: %s: runtime was NULL
> +<6>cx18_alsa: %s: %s called
> +<6>cx18_alsa: %s: %s: length was zero
> +<6>cx18_alsa: %s: stride is zero
> +<6>cx18_alsa: %s: substream was NULL
> @@ -172 +174 @@
> -<6>%s:  info: dualwatch: change stereo flag from 0x%x to 0x%x.
> +<6>%s:  info: dualwatch: change stereo flag from 0x%x to 0x%x
> @@ -188 +190 @@
> -<6>%s:  info: Preparing for firmware halt.
> +<6>%s:  info: Preparing for firmware halt
> @@ -206 +208 @@
> -<6>%s:  info: Switching standard to %llx.
> +<6>%s:  info: Switching standard to %llx
> @@ -236 +237,0 @@
> -<6>%s: %s: created cx18 ALSA interface instance 
> @@ -239 +239,0 @@
> -<6>%s: %s: PCM stream for card is disabled - skipping



> > 2. PLease don't add a pr_fmt() #define to exevry file.  Just put one
> > where all the other CX18_*() macros are defined.  Every file picks those
> > up.
> 
> It's not the first #include of every file.
> printk.h has a default #define pr_fmt(fmt) fmt
> 

Well then don't use "pr_fmt(fmt)" in cx18, if it overloads a define
somewhere else in the kernel and has a dependency on its order relative
to #include statements.  That sort of thing just ups maintenance hours
later.  That's not a good trade off for subjectively better log
messages.

Won't redifining the 'pr_fmt(fmt)' generate preprocessor warnings
anyway?


NACK.

Regards,
Andy 




--
To unsubscribe from this list: send the line "unsubscrib

Re: [GIT FIXES FOR 3.1] pwc: various fixes

2011-08-27 Thread Mauro Carvalho Chehab
Em 24-07-2011 12:21, Hans de Goede escreveu:
> Hi Mauro,
> 
> Please pull from my tree for 2 bug fixes patches + support for
> control events for the pwc driver. Note that the control events
> patch depends upon the patches from hverkuils poll tree
> (and those patches are thus also in my tree, but not part of this
> pull req).
> 
> The following changes since commit 30178e8623281063c18592a848cdcd71f78f603d:
> 
>   vivi: let vb2_poll handle events. (2011-07-18 13:07:28 +0200)
> 
> are available in the git repository at:
>   git://linuxtv.org/hgoede/gspca.git media-for_v3.1
> 
> Dan Carpenter (1):
>   pwc: precedence bug in pwc_init_controls()

Applied.

> 
> Hans de Goede (2):
>   pwc: Add support for control events
>   pwc: properly mark device_hint as unused in all probe error paths

Those ones depend on hverkuil series, pending Al Viro's review.

So, I'm not applying them for now, until we get Hans V. patches merged.

Thanks
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


[PATCH] [media] OMAP_VOUT: Fix check in reqbuf & mmap for buf_size allocation

2011-08-27 Thread Archit Taneja
The commit 383e4f69879d11c86ebdd38b3356f6d0690fb4cc makes reqbuf and mmap 
prevent
requesting a larger size buffer than what is allocated at kernel boot during
omap_vout_probe.

The requested size is comapred with vout->buffer_size, this isn't correct as
vout->buffer_size is later set to the size requested in reqbuf. When the video
device is opened the next time, this check will prevent us to allocate a buffer
which is larger than what we requested the last time.

Don't use vout->buffer_size, always check with the parameters video1_bufsize
or video2_bufsize.

Signed-off-by: Archit Taneja 
---
 drivers/media/video/omap/omap_vout.c |   10 --
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/media/video/omap/omap_vout.c 
b/drivers/media/video/omap/omap_vout.c
index b3a5ecd..b33166a 100644
--- a/drivers/media/video/omap/omap_vout.c
+++ b/drivers/media/video/omap/omap_vout.c
@@ -664,10 +664,14 @@ static int omap_vout_buffer_setup(struct videobuf_queue 
*q, unsigned int *count,
u32 phy_addr = 0, virt_addr = 0;
struct omap_vout_device *vout = q->priv_data;
struct omapvideo_info *ovid = &vout->vid_info;
+   int vid_max_buf_size;
 
if (!vout)
return -EINVAL;
 
+   vid_max_buf_size = vout->vid == OMAP_VIDEO1 ? video1_bufsize :
+   video2_bufsize;
+
if (V4L2_BUF_TYPE_VIDEO_OUTPUT != q->type)
return -EINVAL;
 
@@ -690,7 +694,7 @@ static int omap_vout_buffer_setup(struct videobuf_queue *q, 
unsigned int *count,
video1_numbuffers : video2_numbuffers;
 
/* Check the size of the buffer */
-   if (*size > vout->buffer_size) {
+   if (*size > vid_max_buf_size) {
v4l2_err(&vout->vid_dev->v4l2_dev,
"buffer allocation mismatch [%u] [%u]\n",
*size, vout->buffer_size);
@@ -865,6 +869,8 @@ static int omap_vout_mmap(struct file *file, struct 
vm_area_struct *vma)
unsigned long size = (vma->vm_end - vma->vm_start);
struct omap_vout_device *vout = file->private_data;
struct videobuf_queue *q = &vout->vbq;
+   int vid_max_buf_size = vout->vid == OMAP_VIDEO1 ? video1_bufsize :
+   video2_bufsize;
 
v4l2_dbg(1, debug, &vout->vid_dev->v4l2_dev,
" %s pgoff=0x%lx, start=0x%lx, end=0x%lx\n", __func__,
@@ -887,7 +893,7 @@ static int omap_vout_mmap(struct file *file, struct 
vm_area_struct *vma)
return -EINVAL;
}
/* Check the size of the buffer */
-   if (size > vout->buffer_size) {
+   if (size > vid_max_buf_size) {
v4l2_err(&vout->vid_dev->v4l2_dev,
"insufficient memory [%lu] [%u]\n",
size, vout->buffer_size);
-- 
1.7.1

--
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: [PATCH] gspca_sn9c20x: device 0c45:62b3: fix status LED

2011-08-27 Thread Hans de Goede

Hi,

On 08/22/2011 11:27 PM, Frank Schäfer wrote:

Ping ... what happened to this patch ? ;-)


I think it has fallen through the cracks. I've added it
to my tree for 3.1 / 3.2 (more likely will be 3.2)

Regards,

Hans





Am 01.07.2011 12:19, schrieb Frank Schaefer:

gspca_sn9c20x: device 0c45:62b3: fix status LED

Tested with webcam "SilverCrest WC2130".

Signed-off-by: Frank Schaefer

Cc: sta...@kernel.org
---
drivers/media/video/gspca/sn9c20x.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/media/video/gspca/sn9c20x.c 
b/drivers/media/video/gspca/sn9c20x.c
index c431900..af9cd50 100644
--- a/drivers/media/video/gspca/sn9c20x.c
+++ b/drivers/media/video/gspca/sn9c20x.c
@@ -2513,7 +2513,7 @@ static const struct usb_device_id device_table[] = {
{USB_DEVICE(0x0c45, 0x628f), SN9C20X(OV9650, 0x30, 0)},
{USB_DEVICE(0x0c45, 0x62a0), SN9C20X(OV7670, 0x21, 0)},
{USB_DEVICE(0x0c45, 0x62b0), SN9C20X(MT9VPRB, 0x00, 0)},
- {USB_DEVICE(0x0c45, 0x62b3), SN9C20X(OV9655, 0x30, 0)},
+ {USB_DEVICE(0x0c45, 0x62b3), SN9C20X(OV9655, 0x30, LED_REVERSE)},
{USB_DEVICE(0x0c45, 0x62bb), SN9C20X(OV7660, 0x21, LED_REVERSE)},
{USB_DEVICE(0x0c45, 0x62bc), SN9C20X(HV7131R, 0x11, 0)},
{USB_DEVICE(0x045e, 0x00f4), SN9C20X(OV9650, 0x30, 0)},


--
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


Re: vp702x_fe_set_frontend+0x156/0x1a0 [dvb_usb_vp702x]

2011-08-27 Thread Florian Mickler
On Fri, 26 Aug 2011 23:17:51 +0200
Markus Stephan  wrote:

> Hi Florian,
> 
> Jiri made an other test kernel for me with your final + debug patch applied.
> 
> The box works fine and the message:
> vp702x: usb in operation failed. (-110)
> 
> seams to be triggered by:
> vp702x_fe_set_frontend+0x156/0x1a0 [dvb_usb_vp702x]
> 
> Full dmesg is attached.
> 
> Thank you,
> Markus Stephan

Hi!
Here is a patch to check if that failing op is even necessary. 

But even if it works I don't feel comfortable of suggesting this to be
applied, since I don't have any overview about the hardware supported by this
driver.
Maybe Patrick has any opinion on this, he wrote this driver after all :)

Regards,
Flo

>8--->8>8->8>8---
commit fdcb46dd3627683fc82d14488af10d3072e923f5
Author: Florian Mickler 
Date:   Sat Aug 27 12:01:34 2011 +0200

Let's check if that failing in-op is even necessary.

Even if this turns out to be unnecessary, the right course of action is 
probably
to still leave it there and demote the error message to debug information.

diff --git a/drivers/media/dvb/dvb-usb/vp702x-fe.c 
b/drivers/media/dvb/dvb-usb/vp702x-fe.c
index ad16455..cb6c230 100644
--- a/drivers/media/dvb/dvb-usb/vp702x-fe.c
+++ b/drivers/media/dvb/dvb-usb/vp702x-fe.c
@@ -198,7 +198,7 @@ static int vp702x_fe_set_frontend(struct dvb_frontend* fe,
st->status_check_interval = 250;
st->next_status_check = jiffies;
 
-   vp702x_usb_inout_op(st->d, cmd, 8, cmd, 10, 100);
+   vp702x_usb_out_op(st->d, REQUEST_OUT, 0, 0, cmd, 10);
 
if (cmd[2] == 0 && cmd[3] == 0)
deb_fe("tuning failed.\n");

--
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: [RFCv2 PATCH 0/8] Add V4L2_CTRL_FLAG_VOLATILE and change volatile autocluster handling.

2011-08-27 Thread Hans de Goede

Looks good ACK series.

Acked-by: Hans de Goede 

On 08/26/2011 02:00 PM, Hans Verkuil wrote:

This is the second patch for this. The first is here:

http://comments.gmane.org/gmane.linux.drivers.video-input-infrastructure/36650

This second version changes the pwc code as suggested by Hans de Goede and it
adds documentation. The v4l2-ctrls.c code has also been improved to avoid
unnecessary calls to update_from_auto_cluster(). Thanks to Hans de Goede for
pointing me in the right direction.

If there are no additional comments, then I will make a pull request early next
week.

This will also be the basis for converting soc-camera to the control framework.

Regards,

Hans


--
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