linux-stable.git/drivers/media/platform, branch v3.15.2

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

2014-05-21T10:01:08+00:00

Pull media fixes from Mauro Carvalho Chehab:
 "Most of the changes are drivers fixes (rtl28xuu, fc2580, ov7670,
  davinci, gspca, s5p-fimc and s5c73m3).

  There is also a compat32 fix and one infoleak fixup at the media
  controller"

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  [media] V4L2: fix VIDIOC_CREATE_BUFS in 64- / 32-bit compatibility mode
  [media] V4L2: ov7670: fix a wrong index, potentially Oopsing the kernel from user-space
  [media] media-device: fix infoleak in ioctl media_enum_entities()
  [media] fc2580: fix tuning failure on 32-bit arch
  [media] Prefer gspca_sonixb over sn9c102 for all devices
  [media] media: davinci: vpfe: make sure all the buffers unmapped and released
  [media] staging: media: davinci: vpfe: make sure all the buffers are released
  [media] media: davinci: vpbe_display: fix releasing of active buffers
  [media] media: davinci: vpif_display: fix releasing of active buffers
  [media] media: davinci: vpif_capture: fix releasing of active buffers
  [media] s5p-fimc: Fix YUV422P depth
  [media] s5c73m3: Add missing rename of v4l2_of_get_next_endpoint() function
  [media] rtl28xxu: silence error log about disabled rtl2832_sdr module
  [media] rtl28xxu: do not hard depend on staging SDR module

platform: Fix timberdale dependencies

2014-04-16T06:27:27+00:00

VIDEO_TIMBERDALE selects TIMB_DMA which itself depends on
MFD_TIMBERDALE, so VIDEO_TIMBERDALE should either select or depend on
MFD_TIMBERDALE as well. I chose to make it depend on it because I
think it makes more sense and it is consistent with what other options
are doing.

Adding a "|| HAS_IOMEM" to the TIMB_DMA dependencies silenced the
kconfig warning about unmet direct dependencies but it was wrong:
without MFD_TIMBERDALE, TIMB_DMA is useless as the driver has no
device to bind to.

Signed-off-by: Jean Delvare 
Cc: Vinod Koul 
Cc: Dan Williams 
Cc: Mauro Carvalho Chehab 
Signed-off-by: Vinod Koul

[media] media: davinci: vpfe: make sure all the buffers unmapped and released

2014-04-15T12:54:38+00:00

this patch makes sure that it terminates if any IO in
progress and also makes sure that all the buffers are unmapped.
It was observed that with several runs of application the application
sometimes failed to allocate memory, This patch makes sure it
all the buffers are released.

Using kmemleak it was found that buffer were not released, this patch
fixes following issue,

 echo scan > /sys/kernel/debug/kmemleak
  Kernel message reads:
      memleak: 3 new suspected memory leaks (see /sys/kernel/debug/kmemleak)

Then,
     cat /sys/kernel/debug/kmemleak

  unreferenced object 0xc564a480 (size 192):
  comm "mttest", pid 764, jiffies 4294945878 (age 487.160s)
  hex dump (first 32 bytes):
    00 00 00 00 28 07 07 20 d0 02 00 00 e0 01 00 00  ....(.. ........
    00 00 00 00 00 64 05 00 01 00 00 00 01 00 00 00  .....d..........
  backtrace:
    [] create_object+0x10c/0x28c
    [] kmemleak_alloc+0x3c/0x70
    [] __kmalloc+0x11c/0x1d4
    [] __videobuf_alloc+0x1c/0x3c
    [] videobuf_alloc_vb+0x38/0x80
    [] __videobuf_mmap_setup+0x9c/0x108
    [] videobuf_reqbufs.part.10+0x12c/0x1bc
    [] videobuf_reqbufs+0x6c/0x8c
    [] vpfe_reqbufs+0xcc/0x130
    [] v4l_reqbufs+0x50/0x54
    [] __video_do_ioctl+0x260/0x2c4
    [] video_usercopy+0xf0/0x310
    [] video_ioctl2+0x14/0x1c
    [] v4l2_ioctl+0x104/0x14c
    [] do_vfs_ioctl+0x80/0x2d0
    [] SyS_ioctl+0x44/0x64
unreferenced object 0xc564ac00 (size 192):
  comm "mttest", pid 764, jiffies 4294945878 (age 487.160s)
  hex dump (first 32 bytes):
    01 00 00 00 28 07 07 20 d0 02 00 00 e0 01 00 00  ....(.. ........
    00 00 00 00 00 64 05 00 01 00 00 00 01 00 00 00  .....d..........
  backtrace:
    [] create_object+0x10c/0x28c
    [] kmemleak_alloc+0x3c/0x70
    [] __kmalloc+0x11c/0x1d4
    [] __videobuf_alloc+0x1c/0x3c
    [] videobuf_alloc_vb+0x38/0x80
    [] __videobuf_mmap_setup+0x9c/0x108
    [] videobuf_reqbufs.part.10+0x12c/0x1bc
    [] videobuf_reqbufs+0x6c/0x8c
    [] vpfe_reqbufs+0xcc/0x130
    [] v4l_reqbufs+0x50/0x54
    [] __video_do_ioctl+0x260/0x2c4
    [] video_usercopy+0xf0/0x310
    [] video_ioctl2+0x14/0x1c
    [] v4l2_ioctl+0x104/0x14c
    [] do_vfs_ioctl+0x80/0x2d0
    [] SyS_ioctl+0x44/0x64
unreferenced object 0xc564a180 (size 192):
  comm "mttest", pid 764, jiffies 4294945880 (age 487.140s)
  hex dump (first 32 bytes):
    02 00 00 00 28 07 07 20 d0 02 00 00 e0 01 00 00  ....(.. ........
    00 00 00 00 00 64 05 00 01 00 00 00 01 00 00 00  .....d..........
  backtrace:
    [] create_object+0x10c/0x28c
    [] kmemleak_alloc+0x3c/0x70
    [] __kmalloc+0x11c/0x1d4
    [] __videobuf_alloc+0x1c/0x3c
    [] videobuf_alloc_vb+0x38/0x80
    [] __videobuf_mmap_setup+0x9c/0x108
    [] videobuf_reqbufs.part.10+0x12c/0x1bc
    [] videobuf_reqbufs+0x6c/0x8c
    [] vpfe_reqbufs+0xcc/0x130
    [] v4l_reqbufs+0x50/0x54
    [] __video_do_ioctl+0x260/0x2c4
    [] video_usercopy+0xf0/0x310
    [] video_ioctl2+0x14/0x1c
    [] v4l2_ioctl+0x104/0x14c
    [] do_vfs_ioctl+0x80/0x2d0
    [] SyS_ioctl+0x44/0x64

Reported-by: Jimmy Ho 
Signed-off-by: Lad, Prabhakar 
Signed-off-by: Hans Verkuil 
Signed-off-by: Mauro Carvalho Chehab

[media] media: davinci: vpbe_display: fix releasing of active buffers

2014-04-15T12:50:56+00:00

from commit-id: b3379c6201bb3555298cdbf0aa004af260f2a6a4
"vb2: only call start_streaming if sufficient buffers are queued"
the vb2 framework warns on (WARN_ON()) if all the active buffers
are not released when streaming is stopped, initially the vb2 silently
released the buffer internally if the buffer was not released by
the driver.
This patch fixes following issue:

WARNING: CPU: 0 PID: 2049 at drivers/media/v4l2-core/videobuf2-core.c:2011 __vb2_queue_cancel+0x1a0/0x218()
Modules linked in:
CPU: 0 PID: 2049 Comm: vpbe_display Tainted: G        W    3.14.0-rc5-00414-ged97a6f #89
[] (unwind_backtrace) from [] (show_stack+0x10/0x14)
[] (show_stack) from [] (warn_slowpath_common+0x68/0x88)
[] (warn_slowpath_common) from [] (warn_slowpath_null+0x1c/0x24)
[] (warn_slowpath_null) from [] (__vb2_queue_cancel+0x1a0/0x218)
[] (__vb2_queue_cancel) from [] (vb2_queue_release+0x14/0x24)
[] (vb2_queue_release) from [] (vpbe_display_release+0x60/0x230)
[] (vpbe_display_release) from [] (v4l2_release+0x34/0x74)
[] (v4l2_release) from [] (__fput+0x80/0x224)
[] (__fput) from [] (task_work_run+0xa0/0xd0)
[] (task_work_run) from [] (do_exit+0x244/0x918)
[] (do_exit) from [] (do_group_exit+0x48/0xdc)
[] (do_group_exit) from [] (get_signal_to_deliver+0x2a0/0x5bc)
[] (get_signal_to_deliver) from [] (do_signal+0x78/0x3a0)
[] (do_signal) from [] (do_work_pending+0xa4/0xb4)
[] (do_work_pending) from [] (work_pending+0xc/0x20)
---[ end trace 5faa75e8c2f8a6a1 ]---
------------[ cut here ]------------
WARNING: CPU: 0 PID: 2049 at drivers/media/v4l2-core/videobuf2-core.c:1095 vb2_buffer_done+0x1e0/0x224()
Modules linked in:
CPU: 0 PID: 2049 Comm: vpbe_display Tainted: G        W    3.14.0-rc5-00414-ged97a6f #89
[] (unwind_backtrace) from [] (show_stack+0x10/0x14)
[] (show_stack) from [] (warn_slowpath_common+0x68/0x88)
[] (warn_slowpath_common) from [] (warn_slowpath_null+0x1c/0x24)
[] (warn_slowpath_null) from [] (vb2_buffer_done+0x1e0/0x224)
[] (vb2_buffer_done) from [] (__vb2_queue_cancel+0x1d0/0x218)
[] (__vb2_queue_cancel) from [] (vb2_queue_release+0x14/0x24)
[] (vb2_queue_release) from [] (vpbe_display_release+0x60/0x230)
[] (vpbe_display_release) from [] (v4l2_release+0x34/0x74)
[] (v4l2_release) from [] (__fput+0x80/0x224)
[] (__fput) from [] (task_work_run+0xa0/0xd0)
[] (task_work_run) from [] (do_exit+0x244/0x918)
[] (do_exit) from [] (do_group_exit+0x48/0xdc)
[] (do_group_exit) from [] (get_signal_to_deliver+0x2a0/0x5bc)
[] (get_signal_to_deliver) from [] (do_signal+0x78/0x3a0)
[] (do_signal) from [] (do_work_pending+0xa4/0xb4)
[] (do_work_pending) from [] (work_pending+0xc/0x20)
---[ end trace 5faa75e8c2f8a6a2 ]---

Signed-off-by: Lad, Prabhakar 
Signed-off-by: Hans Verkuil 
Signed-off-by: Mauro Carvalho Chehab

[media] media: davinci: vpif_display: fix releasing of active buffers

2014-04-15T12:50:46+00:00

from commit-id: b3379c6201bb3555298cdbf0aa004af260f2a6a4
"vb2: only call start_streaming if sufficient buffers are queued"
the vb2 framework warns on (WARN_ON()) if all the active buffers
are not released when streaming is stopped, initially the vb2 silently
released the buffer internally if the buffer was not released by
the driver.
Also this patch moves the disabling of interrupts from relase() callback
to stop_streaming() callback as which needs to be done ideally.

This patch fixes following issue:

WARNING: CPU: 0 PID: 2049 at drivers/media/v4l2-core/videobuf2-core.c:2011 __vb2_queue_cancel+0x1a0/0x218()
Modules linked in:
CPU: 0 PID: 2049 Comm: vpif_display Tainted: G        W    3.14.0-rc5-00414-ged97a6f #89
[] (unwind_backtrace) from [] (show_stack+0x10/0x14)
[] (show_stack) from [] (warn_slowpath_common+0x68/0x88)
[] (warn_slowpath_common) from [] (warn_slowpath_null+0x1c/0x24)
[] (warn_slowpath_null) from [] (__vb2_queue_cancel+0x1a0/0x218)
[] (__vb2_queue_cancel) from [] (vb2_queue_release+0x14/0x24)
[] (vb2_queue_release) from [] (vpif_release+0x60/0x230)
[] (vpif_release) from [] (v4l2_release+0x34/0x74)
[] (v4l2_release) from [] (__fput+0x80/0x224)
[] (__fput) from [] (task_work_run+0xa0/0xd0)
[] (task_work_run) from [] (do_exit+0x244/0x918)
[] (do_exit) from [] (do_group_exit+0x48/0xdc)
[] (do_group_exit) from [] (get_signal_to_deliver+0x2a0/0x5bc)
[] (get_signal_to_deliver) from [] (do_signal+0x78/0x3a0)
[] (do_signal) from [] (do_work_pending+0xa4/0xb4)
[] (do_work_pending) from [] (work_pending+0xc/0x20)
---[ end trace 5faa75e8c2f8a6a1 ]---
------------[ cut here ]------------
WARNING: CPU: 0 PID: 2049 at drivers/media/v4l2-core/videobuf2-core.c:1095 vb2_buffer_done+0x1e0/0x224()
Modules linked in:
CPU: 0 PID: 2049 Comm: vpif_display Tainted: G        W    3.14.0-rc5-00414-ged97a6f #89
[] (unwind_backtrace) from [] (show_stack+0x10/0x14)
[] (show_stack) from [] (warn_slowpath_common+0x68/0x88)
[] (warn_slowpath_common) from [] (warn_slowpath_null+0x1c/0x24)
[] (warn_slowpath_null) from [] (vb2_buffer_done+0x1e0/0x224)
[] (vb2_buffer_done) from [] (__vb2_queue_cancel+0x1d0/0x218)
[] (__vb2_queue_cancel) from [] (vb2_queue_release+0x14/0x24)
[] (vb2_queue_release) from [] (vpif_release+0x60/0x230)
[] (vpif_release) from [] (v4l2_release+0x34/0x74)
[] (v4l2_release) from [] (__fput+0x80/0x224)
[] (__fput) from [] (task_work_run+0xa0/0xd0)
[] (task_work_run) from [] (do_exit+0x244/0x918)
[] (do_exit) from [] (do_group_exit+0x48/0xdc)
[] (do_group_exit) from [] (get_signal_to_deliver+0x2a0/0x5bc)
[] (get_signal_to_deliver) from [] (do_signal+0x78/0x3a0)
[] (do_signal) from [] (do_work_pending+0xa4/0xb4)
[] (do_work_pending) from [] (work_pending+0xc/0x20)
---[ end trace 5faa75e8c2f8a6a2 ]---

Signed-off-by: Lad, Prabhakar 
Signed-off-by: Hans Verkuil 
Signed-off-by: Mauro Carvalho Chehab

[media] media: davinci: vpif_capture: fix releasing of active buffers

2014-04-15T12:50:32+00:00

from commit-id: b3379c6201bb3555298cdbf0aa004af260f2a6a4
"vb2: only call start_streaming if sufficient buffers are queued"
the vb2 framework warns on (WARN_ON()) if all the active buffers
are not released when streaming is stopped, initially the vb2 silently
released the buffer internally if the buffer was not released by
the driver.
Also this patch moves the disabling of interrupts from relase() callback
to stop_streaming() callback as which needs to be done ideally.

This patch fixes following issue:

WARNING: CPU: 0 PID: 2049 at drivers/media/v4l2-core/videobuf2-core.c:2011 __vb2_queue_cancel+0x1a0/0x218()
Modules linked in:
CPU: 0 PID: 2049 Comm: vpif_capture Tainted: G        W    3.14.0-rc5-00414-ged97a6f #89
[] (unwind_backtrace) from [] (show_stack+0x10/0x14)
[] (show_stack) from [] (warn_slowpath_common+0x68/0x88)
[] (warn_slowpath_common) from [] (warn_slowpath_null+0x1c/0x24)
[] (warn_slowpath_null) from [] (__vb2_queue_cancel+0x1a0/0x218)
[] (__vb2_queue_cancel) from [] (vb2_queue_release+0x14/0x24)
[] (vb2_queue_release) from [] (vpif_release+0x60/0x230)
[] (vpif_release) from [] (v4l2_release+0x34/0x74)
[] (v4l2_release) from [] (__fput+0x80/0x224)
[] (__fput) from [] (task_work_run+0xa0/0xd0)
[] (task_work_run) from [] (do_exit+0x244/0x918)
[] (do_exit) from [] (do_group_exit+0x48/0xdc)
[] (do_group_exit) from [] (get_signal_to_deliver+0x2a0/0x5bc)
[] (get_signal_to_deliver) from [] (do_signal+0x78/0x3a0)
[] (do_signal) from [] (do_work_pending+0xa4/0xb4)
[] (do_work_pending) from [] (work_pending+0xc/0x20)
---[ end trace 5faa75e8c2f8a6a1 ]---
------------[ cut here ]------------
WARNING: CPU: 0 PID: 2049 at drivers/media/v4l2-core/videobuf2-core.c:1095 vb2_buffer_done+0x1e0/0x224()
Modules linked in:
CPU: 0 PID: 2049 Comm: vpif_capture Tainted: G        W    3.14.0-rc5-00414-ged97a6f #89
[] (unwind_backtrace) from [] (show_stack+0x10/0x14)
[] (show_stack) from [] (warn_slowpath_common+0x68/0x88)
[] (warn_slowpath_common) from [] (warn_slowpath_null+0x1c/0x24)
[] (warn_slowpath_null) from [] (vb2_buffer_done+0x1e0/0x224)
[] (vb2_buffer_done) from [] (__vb2_queue_cancel+0x1d0/0x218)
[] (__vb2_queue_cancel) from [] (vb2_queue_release+0x14/0x24)
[] (vb2_queue_release) from [] (vpif_release+0x60/0x230)
[] (vpif_release) from [] (v4l2_release+0x34/0x74)
[] (v4l2_release) from [] (__fput+0x80/0x224)
[] (__fput) from [] (task_work_run+0xa0/0xd0)
[] (task_work_run) from [] (do_exit+0x244/0x918)
[] (do_exit) from [] (do_group_exit+0x48/0xdc)
[] (do_group_exit) from [] (get_signal_to_deliver+0x2a0/0x5bc)
[] (get_signal_to_deliver) from [] (do_signal+0x78/0x3a0)
[] (do_signal) from [] (do_work_pending+0xa4/0xb4)
[] (do_work_pending) from [] (work_pending+0xc/0x20)
---[ end trace 5faa75e8c2f8a6a2 ]---

Signed-off-by: Lad, Prabhakar 
Signed-off-by: Hans Verkuil 
Signed-off-by: Mauro Carvalho Chehab

[media] s5p-fimc: Fix YUV422P depth

2014-04-15T12:50:06+00:00

All YUV 422 has 16bit per pixels.

Signed-off-by: Nicolas Dufresne 
Signed-off-by: Mauro Carvalho Chehab

[media] v4l: ti-vpe: retain v4l2_buffer flags for captured buffers

2014-04-07T12:44:25+00:00

The dequed CAPTURE_MPLANE type buffers don't contain the flags that the
originally queued OUTPUT_MPLANE type buffers have. This breaks compliance.

Copy the source v4l2_buffer flags to the destination v4l2_buffer flags before
they are dequed.

Reviewed-by: Hans Verkuil 
Signed-off-by: Archit Taneja 
Signed-off-by: Mauro Carvalho Chehab

[media] v4l: ti-vpe: Set correct field parameter for output and capture buffers

2014-04-07T12:43:51+00:00

The vpe driver wasn't setting the correct field parameter for dequed CAPTURE
type buffers for the case where the captured output is progressive.

Set the field to V4L2_FIELD_NONE for the completed destination buffers when
the captured output is progressive.

For OUTPUT type buffers, a queued buffer's field is forced to V4L2_FIELD_NONE
if the pixel format(configured through s_fmt for the buffer type
V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE specifies) the field type isn't interlaced.
If the pixel format specified was V4L2_FIELD_ALTERNATE, and the queued buffer's
field isn't V4L2_FIELD_TOP or V4L2_FIELD_BOTTOM, the vb2 buf_prepare op returns
an error.

This ensures compliance, and that the dequeued output and captured buffers
contain the field type that the driver used internally.

Signed-off-by: Archit Taneja 
Signed-off-by: Mauro Carvalho Chehab

[media] v4l: ti-vpe: zero out reserved fields in try_fmt

2014-04-07T12:43:32+00:00

Zero out the reserved formats in v4l2_pix_format_mplane and
v4l2_plane_pix_format members of the returned v4l2_format pointer when passed
through TRY_FMT ioctl.

This ensures that the user doesn't interpret the non-zero fields as some data
passed by the driver, and ensures compliance.

Reviewed-by: Hans Verkuil 
Signed-off-by: Archit Taneja 
Signed-off-by: Mauro Carvalho Chehab