linux.git/drivers/media, branch v3.5-rc6

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

2012-06-25T21:53:09+00:00

Pull media fixes from Mauro Carvalho Chehab.

Trivial conflict due to new USB HID ID's being added next to each other
(Baanto vs Axentia).

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (44 commits)
  [media] smia: Fix compile failures
  [media]  Fix VIDIOC_DQEVENT docbook entry
  [media] s5p-fimc: Fix control creation function
  [media] s5p-mfc: Fix checkpatch error in s5p_mfc_shm.h file
  [media] s5p-mfc: Fix setting controls
  [media] v4l/s5p-mfc: added image size align in VIDIOC_TRY_FMT
  [media] v4l/s5p-mfc: corrected encoder v4l control definitions
  [media] v4l: mem2mem_testdev: Fix race conditions in driver
  [media] s5p-mfc: Bug fix of timestamp/timecode copy mechanism
  [media] cxd2820r: Fix an incorrect modulation type bitmask
  [media] em28xx: Show a warning if the board does not support remote controls
  [media] em28xx: Add remote control support for Terratec's Cinergy HTC Stick HD
  [media] USB: Staging: media: lirc: initialize spinlocks before usage
  [media] Revert "[media] media: mx2_camera: Fix mbus format handling"
  [media] bw-qcam: driver and pixfmt documentation fixes
  [media] cx88: fix firmware load on big-endian systems
  [media] cx18: support big-endian systems
  [media] ivtv: fix support for big-endian systems
  [media] tuner-core: return the frequency range of the correct tuner
  [media] v4l2-dev.c: fix g_parm regression in determine_valid_ioctls()
  ...

media: pms.c needs linux/slab.h

2012-06-21T05:10:08+00:00

drivers/media/video/pms.c uses kzalloc() and kfree() so it should
include  to fix build errors and a warning.

  drivers/media/video/pms.c:1047:2: error: implicit declaration of function 'kzalloc'
  drivers/media/video/pms.c:1047:6: warning: assignment makes pointer from integer without a cast
  drivers/media/video/pms.c:1116:2: error: implicit declaration of function 'kfree'

Found in mmotm but applies to mainline.

Signed-off-by: Randy Dunlap 
Cc: Hans Verkuil 
Signed-off-by: Linus Torvalds

[media] smia: Fix compile failures

2012-06-18T22:52:05+00:00

Fix compile of smia code.

Resolves-bug: https://bugzilla.kernel.org/show_bug.cgi?id=43337

Signed-off-by: Alan Cox 
Signed-off-by: Sakari Ailus 
Signed-off-by: Mauro Carvalho Chehab

[media] s5p-fimc: Fix control creation function

2012-06-18T22:49:27+00:00

Fixed the size of the V4L2_CID_COLORFX control cluster.
Prior to this fix V4L2_CID_ROTATE was also icluded in
the cluster preventing application from enabling rotation.

Reported-by: Marek Szyprowski 
Signed-off-by: Kamil Debski 
Signed-off-by: Kyungmin Park 
Signed-off-by: Marek Szyprowski 
Signed-off-by: Mauro Carvalho Chehab

[media] s5p-mfc: Fix checkpatch error in s5p_mfc_shm.h file

2012-06-18T22:49:06+00:00

Fixes the following error:
ERROR: open brace '{' following enum go on the same line
+enum MFC_SHM_OFS
+{

Signed-off-by: Sachin Kamat 
Acked-by: Kamil Debski 
Signed-off-by: Marek Szyprowski 
Signed-off-by: Mauro Carvalho Chehab

[media] s5p-mfc: Fix setting controls

2012-06-18T22:48:43+00:00

Fixed s_ctrl function when setting the following controls:
- V4L2_CID_MPEG_VIDEO_DECODER_MPEG4_DEBLOCK_FILTER
- V4L2_CID_MPEG_MFC51_VIDEO_DECODER_H264_DISPLAY_DELAY

Signed-off-by: Kamil Debski 
Signed-off-by: Kyungmin Park 
Signed-off-by: Marek Szyprowski 
Signed-off-by: Mauro Carvalho Chehab

[media] v4l/s5p-mfc: added image size align in VIDIOC_TRY_FMT

2012-06-18T22:48:14+00:00

Image size for MFC encoder should have size between
8x4 and 1920x1080 with even width and height.

Signed-off-by: Andrzej Hajda 
Signed-off-by: Kyungmin Park 
Signed-off-by: Marek Szyprowski 
Signed-off-by: Mauro Carvalho Chehab

[media] v4l/s5p-mfc: corrected encoder v4l control definitions

2012-06-18T22:47:48+00:00

Patch corrects definition of H264 level control and
changes bare numbers to enums in two other cases.

Signed-off-by: Andrzej Hajda 
Signed-off-by: Kyungmin Park 
Signed-off-by: Marek Szyprowski 
Signed-off-by: Mauro Carvalho Chehab

[media] v4l: mem2mem_testdev: Fix race conditions in driver

2012-06-18T22:45:59+00:00

The mem2mem_testdev allows multiple instances to be opened in parallel.
Source and destination queue data are being shared between all
instances, which can lead to kernel oops due to race conditions (most
likely to happen inside device_run()).

Attached patch fixes mentioned problem by storing queue data per device
context.

Signed-off-by: Tomasz Moń 
Signed-off-by: Marek Szyprowski 
Signed-off-by: Mauro Carvalho Chehab

[media] s5p-mfc: Bug fix of timestamp/timecode copy mechanism

2012-06-18T22:44:46+00:00

Fixed the code copying timecode/timestamp to corresponding
frames between OUTPUT and CAPTURE.

Signed-off-by: Kamil Debski 
Signed-off-by: Kyungmin Park 
Signed-off-by: Marek Szyprowski 
Signed-off-by: Mauro Carvalho Chehab