kernel.git/drivers/media/platform/omap, branch linux-4.1.y

[media] media: omap/omap_vout: fix type of input members to omap_vout_setup_vrfb_bufs()

2015-03-03T14:22:58Z

the declaration for omap_vout_setup_vrfb_bufs() said it needed 'u32 static_vrfb_allocation' but definition took 'bool static_vrfb_allocation', this patch fixes the declaration so that it matches with the definition and pass a bool instead of int to the call, also included omap_vout_vrfb.h in omap_vout_vrfb.c file so that sparse doesn't complain of making omap_vout_setup_vrfb_bufs() as static function. Signed-off-by: Lad, Prabhakar Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab

[media] omap_vout: fix compile warnings

2014-12-02T13:35:05Z

When compiling under COMPILE_TEST on a x86_64 the following warnings appear: drivers/media/platform/omap/omap_vout.c: In function 'omap_vout_uservirt_to_phys': drivers/media/platform/omap/omap_vout.c:209:23: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] return virt_to_phys((void *) virtp); ^ drivers/media/platform/omap/omap_vout.c: In function 'omapvid_setup_overlay': drivers/media/platform/omap/omap_vout.c:420:2: warning: format '%x' expects argument of type 'unsigned int', but argument 5 has type 'dma_addr_t' [-Wformat=] v4l2_dbg(1, debug, &vout->vid_dev->v4l2_dev, ^ drivers/media/platform/omap/omap_vout.c: In function 'omap_vout_buffer_prepare': drivers/media/platform/omap/omap_vout.c:794:34: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] vout->queued_buf_addr[vb->i] = (u8 *) ^ In file included from arch/x86/include/asm/dma-mapping.h:44:0, from include/linux/dma-mapping.h:82, from drivers/media/platform/omap/omap_vout.c:40: drivers/media/platform/omap/omap_vout.c:803:58: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] dma_addr = dma_map_single(vout->vid_dev->v4l2_dev.dev, (void *) addr, ^ include/asm-generic/dma-mapping-common.h:174:60: note: in definition of macro 'dma_map_single' #define dma_map_single(d, a, s, r) dma_map_single_attrs(d, a, s, r, NULL) ^ These are fixed by this patch. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab

[media] media/platform: fix querycap

2014-12-02T13:31:34Z

Querycap shouldn't set the version field (the core does that for you), but it should set the device_caps field. Signed-off-by: Hans Verkuil Cc: Scott Jiang Cc: Gerhard Sittig Cc: Jonathan Corbet Cc: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab

[media] omap: disable COMPILE_TEST

2014-11-26T12:27:29Z

This causes lots of errors, because of sub-arch specific dependencies: All error/warnings: >> ERROR: "omapdss_compat_init" [drivers/media/platform/omap/omap-vout.ko] undefined! >> ERROR: "omap_dss_get_overlay_manager" [drivers/media/platform/omap/omap-vout.ko] undefined! >> ERROR: "omap_dss_get_num_overlay_managers" [drivers/media/platform/omap/omap-vout.ko] undefined! >> ERROR: "omap_dss_get_overlay" [drivers/media/platform/omap/omap-vout.ko] undefined! >> ERROR: "omapdss_is_initialized" [drivers/media/platform/omap/omap-vout.ko] undefined! >> ERROR: "omap_dispc_register_isr" [drivers/media/platform/omap/omap-vout.ko] undefined! >> ERROR: "omapdss_get_version" [drivers/media/platform/omap/omap-vout.ko] undefined! >> ERROR: "omap_dss_put_device" [drivers/media/platform/omap/omap-vout.ko] undefined! >> ERROR: "omap_dss_get_next_device" [drivers/media/platform/omap/omap-vout.ko] undefined! >> ERROR: "omap_dispc_unregister_isr" [drivers/media/platform/omap/omap-vout.ko] undefined! >> ERROR: "omapdss_compat_uninit" [drivers/media/platform/omap/omap-vout.ko] undefined! >> ERROR: "omap_dss_get_device" [drivers/media/platform/omap/omap-vout.ko] undefined! >> ERROR: "omap_dss_get_num_overlays" [drivers/media/platform/omap/omap-vout.ko] undefined! Signed-off-by: Mauro Carvalho Chehab

[media] omap: Fix typo "HAS_MMU"

2014-11-25T15:38:26Z

Commit 38a073116525 ("[media] omap: be sure that MMU is there for COMPILE_TEST") added a dependency on HAS_MMU. There's no Kconfig symbol HAS_MMU. Use MMU instead. Signed-off-by: Paul Bolle Signed-off-by: Mauro Carvalho Chehab

[media] omap: simplify test logic

2014-09-03T20:59:25Z

instead of testing bools if they are false or true, just use if (!foo) or if (foo). That makes the code easier to read and shorter. Also, properly initialize booleans with true or false. Signed-off-by: Mauro Carvalho Chehab

[media] omap: be sure that MMU is there for COMPILE_TEST

2014-08-26T21:52:20Z

COMPILE_TEST fail on (some) archs without MMU. Signed-off-by: Mauro Carvalho Chehab

[media] enable COMPILE_TEST for OMAP2 vout

2014-08-26T21:52:18Z

We don't need anything special to enable COMPILE_TEST for this driver. Signed-off-by: Mauro Carvalho Chehab

[media] omap_vout: Get rid of a few warnings

2014-08-26T21:52:10Z

drivers/media/platform/omap/omap_vout.c: In function 'omapvid_setup_overlay': drivers/media/platform/omap/omap_vout.c:372:29: warning: variable 'pixheight' set but not used [-Wunused-but-set-variable] int cropheight, cropwidth, pixheight, pixwidth; ^ drivers/media/platform/omap/omap_vout.c: In function 'vidioc_s_ctrl': drivers/media/platform/omap/omap_vout.c:1454:24: warning: variable 'ovl' set but not used [-Wunused-but-set-variable] struct omap_overlay *ovl; ^ drivers/media/platform/omap/omap_vout.c: In function 'vidioc_reqbufs': drivers/media/platform/omap/omap_vout.c:1492:55: warning: comparison of unsigned expression < 0 is always false [-Wtype-limits] if ((req->type != V4L2_BUF_TYPE_VIDEO_OUTPUT) || (req->count < 0)) ^ Signed-off-by: Mauro Carvalho Chehab

[media] omap: fix compilation if !VIDEO_OMAP2_VOUT_VRFB

2014-08-26T21:52:05Z

When CONFIG_VIDEO_OMAP2_VOUT_VRFB is disabled, the compilation will fail, as the function stubs are wrong. Also, as they weren't declared as static inline, lots of warnings will be generated. Signed-off-by: Mauro Carvalho Chehab