linux-toradex.git/drivers/media/platform, branch v3.18.21

[media] soc-camera: Fix devm_kfree() in soc_of_bind()

2015-04-24T21:14:09+00:00

[ Upstream commit 8e48a2d54c5d74ea3e9dc4c3b9037786bb447f36 ]

Unlike scan_async_group(), soc_of_bind() doesn't allocate its
soc_camera_async_client structure using devm_kzalloc(), but has it
embedded inside the soc_of_info structure.  Hence on failure, it must
free the whole soc_of_info structure, and not just the embedded
soc_camera_async_client structure, as the latter causes a warning, and
may cause slab corruption:

    soc-camera-pdrv soc-camera-pdrv.0: Probing soc-camera-pdrv.0
    ------------[ cut here ]------------
    WARNING: CPU: 0 PID: 1 at drivers/base/devres.c:887 devm_kfree+0x30/0x40()
    CPU: 0 PID: 1 Comm: swapper/0 Not tainted 3.19.0-shmobile-08386-g37feb0d093cb2d8e #128
    Hardware name: Generic R8A7791 (Flattened Device Tree)
    Backtrace:
    [] (dump_backtrace) from [] (show_stack+0x18/0x1c)
     r6:c05a923b r5:00000009 r4:00000000 r3:00204140
    [] (show_stack) from [] (dump_stack+0x78/0x94)
    [] (dump_stack) from [] (warn_slowpath_common+0x8c/0xb8)
     r4:00000000 r3:00000000
    [] (warn_slowpath_common) from [] (warn_slowpath_null+0x24/0x2c)
     r8:ee7d8214 r7:ed83b810 r6:ed83bc20 r5:fffffffa r4:ed83e510
    [] (warn_slowpath_null) from [] (devm_kfree+0x30/0x40)
    [] (devm_kfree) from [] (soc_of_bind.isra.14+0x194/0x1d4)
    [] (soc_of_bind.isra.14) from [] (soc_camera_host_register+0x208/0x31c)
     r9:00000070 r8:ee7e05d0 r7:ee153210 r6:00000000 r5:ee7e0218 r4:ed83bc20
    [] (soc_camera_host_register) from [] (rcar_vin_probe+0x1f4/0x238)
     r8:ee153200 r7:00000008 r6:ee153210 r5:ed83bc10 r4:c066319c r3:000000c0
    [] (rcar_vin_probe) from [] (platform_drv_probe+0x50/0xa0)
     r10:00000000 r9:c0662fa8 r8:00000000 r7:c06a3700 r6:c0662fa8 r5:ee153210
     r4:00000000
    [] (platform_drv_probe) from [] (driver_probe_device+0xc4/0x208)
     r6:c06a36f4 r5:00000000 r4:ee153210 r3:c025c2e4
    [] (driver_probe_device) from [] (__driver_attach+0x70/0x94)
     r9:c066f9c0 r8:c0624a98 r7:c065b790 r6:c0662fa8 r5:ee153244 r4:ee153210
    [] (__driver_attach) from [] (bus_for_each_dev+0x74/0x98)
     r6:c025b098 r5:c0662fa8 r4:00000000 r3:00000001
    [] (bus_for_each_dev) from [] (driver_attach+0x20/0x28)
     r6:ed83c200 r5:00000000 r4:c0662fa8
    [] (driver_attach) from [] (bus_add_driver+0xdc/0x1c4)
    [] (bus_add_driver) from [] (driver_register+0xa4/0xe8)
     r7:c0624a98 r6:00000000 r5:c060b010 r4:c0662fa8
    [] (driver_register) from [] (__platform_driver_register+0x50/0x64)
     r5:c060b010 r4:ed8394c0
    [] (__platform_driver_register) from [] (rcar_vin_driver_init+0x18/0x20)
    [] (rcar_vin_driver_init) from [] (do_one_initcall+0x108/0x1b8)
    [] (do_one_initcall) from [] (kernel_init_freeable+0x11c/0x1e4)
     r9:c066f9c0 r8:c066f9c0 r7:c062eab0 r6:c06252c4 r5:000000ad r4:00000006
    [] (kernel_init_freeable) from [] (kernel_init+0x10/0xec)
     r9:00000000 r8:00000000 r7:00000000 r6:00000000 r5:c048c3c0 r4:00000000
    [] (kernel_init) from [] (ret_from_fork+0x14/0x34)
     r4:00000000 r3:ee04e000
    ---[ end trace e3a984cc0335c8a0 ]---
    rcar_vin e6ef1000.video: group probe failed: -6

Fixes: 1ddc6a6caa94e1e1 ("[media] soc_camera: add support for dt binding soc_camera drivers")

Cc:  # 3.17+
Signed-off-by: Geert Uytterhoeven 
Signed-off-by: Guennadi Liakhovetski 
Signed-off-by: Mauro Carvalho Chehab 
Signed-off-by: Sasha Levin

[media] media: s5p-mfc: fix mmap support for 64bit arch

2015-04-24T21:14:08+00:00

[ Upstream commit 05b676ab42f624425d5f6519276e506b812fa058 ]

TASK_SIZE is depends on the systems architecture (32 or 64 bits) and it
should not be used for defining offset boundary for mmaping buffers for
CAPTURE and OUTPUT queues. This patch fixes support for MMAP calls on
the CAPTURE queue on 64bit architectures (like ARM64).

Cc: stable@vger.kernel.org
Signed-off-by: Marek Szyprowski 
Signed-off-by: Kamil Debski 
Signed-off-by: Mauro Carvalho Chehab 
Signed-off-by: Sasha Levin

[media] sh_veu: v4l2_dev wasn't set

2015-04-24T21:14:07+00:00

[ Upstream commit ab3120300be067a2d41a027c41db0b2c662ab200 ]

The v4l2_dev field of struct video_device must be set correctly.
This was never done for this driver, so no video nodes were created
anymore.

Signed-off-by: Hans Verkuil 
Cc:       # for v3.11 and up
Signed-off-by: Mauro Carvalho Chehab 
Signed-off-by: Sasha Levin

timberdale: do not select TIMB_DMA

2015-03-06T22:52:51+00:00

commit 244829226f47ffb4d6009a2ccd2771cd149d8114 upstream.

The timberdale media driver requires the use of the respective
dma engine driver, but that may not be enabled, causing a
Kconfig warning:

warning: (VIDEO_TIMBERDALE) selects TIMB_DMA which has unmet direct dependencies (DMADEVICES && MFD_TIMBERDALE)

This fixes the dependency by removing the inappropriate 'select'
statement and replacing it with a direct dependency on the
drivers that provide the services this needs.

Fixes: 7155043c2d027 ("[media] enable COMPILE_TEST for media drivers")

Signed-off-by: Arnd Bergmann 
Signed-off-by: Hans Verkuil 
Signed-off-by: Mauro Carvalho Chehab 
Signed-off-by: Greg Kroah-Hartman

vivid: fix CROP_BOUNDS typo for video output

2015-01-27T16:29:40+00:00

commit bb9ff078860f9d2f79d3a6bea3af9f48354ddb75 upstream.

An error was returned if composing was not supported, instead of if
cropping was not supported.

A classic copy-and-paste bug. Found with v4l2-compliance.

Signed-off-by: Hans Verkuil 
Signed-off-by: Mauro Carvalho Chehab 
Signed-off-by: Greg Kroah-Hartman

[media] vivid: default to single planar device instances

2014-11-03T16:43:26+00:00

The default used to be that the first vivid device instance was
single planar, the second multi planar, the third single planar, etc.

However, that turned out to be unexpected and awkward. Change the
driver to always default to single planar.

Signed-off-by: Hans Verkuil 
Signed-off-by: Mauro Carvalho Chehab

[media] s5p-jpeg: Avoid -Wuninitialized warning in s5p_jpeg_parse_hdr

2014-10-24T11:36:59+00:00

Initialize components variable in order to avoid
the possibility of using it uninitialized.

Signed-off-by: Jacek Anaszewski 
Signed-off-by: Sylwester Nawrocki 
Signed-off-by: Mauro Carvalho Chehab

[media] s5p-fimc: Only build suspend/resume for PM

2014-10-24T11:36:38+00:00

If power management is disabled these functions become unused, so there
is no reason to build them. This fixes a couple of build warnings when
PM(_SLEEP,_RUNTIME) is not enabled.

Signed-off-by: Thierry Reding 
Signed-off-by: Sylwester Nawrocki 
Signed-off-by: Mauro Carvalho Chehab

[media] s5p-jpeg: Only build suspend/resume for PM

2014-10-24T11:36:20+00:00

If power management is disabled these function become unused, so there
is no reason to build them. This fixes a couple of build warnings when
PM(_SLEEP,_RUNTIME) is not enabled.

Acked-by: Geert Uytterhoeven 
Signed-off-by: Thierry Reding 
Signed-off-by: Sylwester Nawrocki 
Signed-off-by: Mauro Carvalho Chehab

[media] Remove references to non-existent PLAT_S5P symbol

2014-10-24T11:35:27+00:00

The PLAT_S5P Kconfig symbol was removed in commit d78c16ccde96
("ARM: SAMSUNG: Remove remaining legacy code"). However, there
are still some references to that symbol left, fix that by
substituting them with ARCH_S5PV210.

Fixes: d78c16ccde96 ("ARM: SAMSUNG: Remove remaining legacy code")

Reported-by: Paul Bolle 
Cc:  # for 3.17
Signed-off-by: Sylwester Nawrocki 
Signed-off-by: Mauro Carvalho Chehab