From: Hans Verkuil <hverkuil@xs4all.nl>
To: Hardik Shah <hardik.shah@ti.com>
Cc: linux-media@vger.kernel.org, linux-omap@vger.kernel.org,
Brijesh Jadav <brijesh.j@ti.com>,
Vaibhav Hiremath <hvaibhav@ti.com>
Subject: Re: [PATCH 3/3] V4L2 Driver for OMAP3/3 DSS.
Date: Mon, 30 Mar 2009 15:06:35 +0200 [thread overview]
Message-ID: <200903301506.36134.hverkuil@xs4all.nl> (raw)
In-Reply-To: <1237526408-14249-1-git-send-email-hardik.shah@ti.com>
On Friday 20 March 2009 06:20:08 Hardik Shah wrote:
> This is the version 3rd of the driver. This is a review
> patch since the DSS2 library is not accepted.
> Most of the community comments are addressed like
> 1. V4L2 Driver for OMAP3/3 DSS.
> 2. Conversion of the custom ioctls to standard V4L2 ioctls like
> alpha blending, color keying, rotation and back ground color setting
> 3. Re-organised the code as per community comments.
>
> Following are the features tested.
> 1. Provides V4L2 user interface for the video pipelines of DSS
> 2. Basic streaming working on LCD and TV.
> 3. Support for various pixel formats like YUV, UYVY, RGB32, RGB24, RGB565
> 4. Supports Alpha blending.
> 5. Supports Color keying both source and destination.
> 6. Supports rotation with RGB565 and RGB32 pixels formats.
> 7. Supports cropping.
> 8. Supports Background color setting.
> 9. Works on latest DSS2 library from Tomi with minor changes.
> http://www.bat.org/~tomba/git/linux-omap-dss.git/
>
> TODOS
> 1. Flipping support.
> 2. Rotation support for YUV and UYVY format
> 3. Ioctls for programming the color space conversion matrix
> 4. DVI resolution test.
>
> Signed-off-by: Brijesh Jadav <brijesh.j@ti.com>
> Signed-off-by: Hardik Shah <hardik.shah@ti.com>
> Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
> ---
> arch/arm/mach-omap2/board-omap3evm.c | 19 +-
> drivers/media/video/Kconfig | 20 +
> drivers/media/video/Makefile | 4 +
> drivers/media/video/omap/Kconfig | 60 +
> drivers/media/video/omap/Makefile | 3 +
> drivers/media/video/omap/omap_vout.c | 2571 +++++++++++++++++++++++++++++++
> drivers/media/video/omap/omap_voutdef.h | 137 ++
> drivers/media/video/omap/omap_voutlib.c | 281 ++++
> drivers/media/video/omap/omap_voutlib.h | 34 +
> 9 files changed, 3126 insertions(+), 3 deletions(-)
> create mode 100644 drivers/media/video/omap/Kconfig
> create mode 100644 drivers/media/video/omap/Makefile
> create mode 100644 drivers/media/video/omap/omap_vout.c
> create mode 100644 drivers/media/video/omap/omap_voutdef.h
> create mode 100644 drivers/media/video/omap/omap_voutlib.c
> create mode 100644 drivers/media/video/omap/omap_voutlib.h
>
> diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
> index 2740500..ffec76d 100644
> --- a/arch/arm/mach-omap2/board-omap3evm.c
> +++ b/arch/arm/mach-omap2/board-omap3evm.c
> @@ -42,7 +42,6 @@
> #include "twl4030-generic-scripts.h"
> #include "mmc-twl4030.h"
>
> -
> static struct resource omap3evm_smc911x_resources[] = {
> [0] = {
> .start = OMAP3EVM_ETHR_START,
> @@ -63,6 +62,20 @@ static struct platform_device omap3evm_smc911x_device = {
> .resource = &omap3evm_smc911x_resources [0],
> };
>
> +#ifdef CONFIG_FB_OMAP2
> +static struct resource omap3evm_vout_resource[3 - CONFIG_FB_OMAP2_NUM_FBS] = {
> +};
> +#else
> +static struct resource omap3evm_vout_resource[2] = {
> +};
> +#endif
> +
> +static struct platform_device omap3evm_vout_device = {
> + .name = "omap_vout",
> + .num_resources = ARRAY_SIZE(omap3evm_vout_resource),
> + .resource = &omap3evm_vout_resource[0],
> + .id = -1,
> +};
> static inline void __init omap3evm_init_smc911x(void)
> {
> int eth_cs;
> @@ -307,7 +320,6 @@ static struct omap_display_data omap3_evm_display_data_tv = {
> .panel_disable = omap3_evm_panel_disable_tv,
> };
>
> -
> static int omap3_evm_panel_enable_dvi(struct omap_display *display)
> {
> if (lcd_enabled) {
> @@ -332,7 +344,6 @@ static void omap3_evm_panel_disable_dvi(struct omap_display *display)
> dvi_enabled = 0;
> }
>
> -
> static struct omap_display_data omap3_evm_display_data_dvi = {
> .type = OMAP_DISPLAY_TYPE_DPI,
> .name = "dvi",
> @@ -419,6 +430,8 @@ static struct omap_board_config_kernel omap3_evm_config[] __initdata = {
> static struct platform_device *omap3_evm_devices[] __initdata = {
> &omap3_evm_dss_device,
> &omap3evm_smc911x_device,
> + &omap3evm_vout_device,
> +
> };
>
> static struct twl4030_hsmmc_info mmc[] __initdata = {
> diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
> index 19cf3b8..91e4529 100644
> --- a/drivers/media/video/Kconfig
> +++ b/drivers/media/video/Kconfig
> @@ -711,6 +711,26 @@ config VIDEO_CAFE_CCIC
> CMOS camera controller. This is the controller found on first-
> generation OLPC systems.
>
> +#config VIDEO_OMAP3
> +# tristate "OMAP 3 Camera support"
> +# select VIDEOBUF_GEN
> +# select VIDEOBUF_DMA_SG
> +# depends on VIDEO_V4L2 && ARCH_OMAP34XX
> +# ---help---
> +# Driver for an OMAP 3 camera controller.
Why add a commented config?
> +
> +config VIDEO_OMAP3
> + bool "OMAP2/OMAP3 Camera and V4L2-DSS drivers"
> + select VIDEOBUF_GEN
> + select VIDEOBUF_DMA_SG
> + select OMAP2_DSS
> + depends on VIDEO_DEV && (ARCH_OMAP24XX || ARCH_OMAP34XX)
> + default y
> + ---help---
> + V4L2 DSS and Camera driver support for OMAP2/3 based boards.
> +
> +source "drivers/media/video/omap/Kconfig"
> +
> config SOC_CAMERA
> tristate "SoC camera support"
> depends on VIDEO_V4L2 && HAS_DMA
> diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
> index 72f6d03..e8de241 100644
> --- a/drivers/media/video/Makefile
> +++ b/drivers/media/video/Makefile
> @@ -107,6 +107,10 @@ obj-$(CONFIG_VIDEO_CAFE_CCIC) += cafe_ccic.o
> obj-$(CONFIG_VIDEO_OV7670) += ov7670.o
>
> obj-$(CONFIG_VIDEO_TCM825X) += tcm825x.o
> +obj-$(CONFIG_VIDEO_MT9P012) += mt9p012.o
> +obj-$(CONFIG_VIDEO_DW9710) += dw9710.o
> +
> +obj-$(CONFIG_VIDEO_OMAP3) += omap/
>
> obj-$(CONFIG_USB_DABUSB) += dabusb.o
> obj-$(CONFIG_USB_OV511) += ov511.o
> diff --git a/drivers/media/video/omap/Kconfig b/drivers/media/video/omap/Kconfig
> new file mode 100644
> index 0000000..00bd425
> --- /dev/null
> +++ b/drivers/media/video/omap/Kconfig
> @@ -0,0 +1,60 @@
> +config VIDEO_OMAP_VIDEOLIB
> + tristate "OMAP Video out library"
> + depends on VIDEO_OMAP3
> + default VIDEO_OMAP3
> +
> +config VIDEO_OMAP_VIDEOOUT
> + tristate "OMAP Video out driver"
> + select VIDEOBUF_DMA_SG
> + select VIDEOBUF_GEN
> + depends on VIDEO_OMAP3
> + default VIDEO_OMAP3
> +
> +choice
> + prompt "VID1 Overlay manager"
> + depends on VIDEO_OMAP_VIDEOOUT
> + default VID1_LCD_MANAGER
> +
> +config VID1_TV_MANAGER
> + bool "Use TV Manager"
> + help
> + Select this option if you want VID1 pipeline on TV Overlay manager
> +
> +config VID1_LCD_MANAGER
> + bool "Use LCD Managaer"
> + help
> + Select this option if you want VID1 pipeline on LCD Overlay manager
> +endchoice
> +
> +choice
> + prompt "VID2 Overlay manager"
> + depends on VIDEO_OMAP_VIDEOOUT
> + default VID2_LCD_MANAGER
> +
> +config VID2_TV_MANAGER
> + bool "Use TV Manager"
> + help
> + Select this option if you want VID2 pipeline on TV Overlay manager
> +
> +config VID2_LCD_MANAGER
> + bool "Use LCD Managaer"
> + help
> + Select this option if you want VID2 pipeline on LCD Overlay manager
> +endchoice
> +
> +choice
> + prompt "TV Mode"
> + depends on VID2_TV_MANAGER || VID1_TV_MANAGER
> + default NTSC_M
> +
> +config NTSC_M
> + bool "Use NTSC_M mode"
> + help
> + Select this option if you want NTSC_M mode on TV
> +
> +config PAL_BDGHI
> + bool "Use PAL_BDGHI mode"
> + help
> + Select this option if you want PAL_BDGHI mode on TV
Why are these config options? Isn't it possible to do this dynamically
through VIDIOC_S_STD?
> +
> +endchoice
> diff --git a/drivers/media/video/omap/Makefile b/drivers/media/video/omap/Makefile
> new file mode 100644
> index 0000000..75e01d3
> --- /dev/null
> +++ b/drivers/media/video/omap/Makefile
> @@ -0,0 +1,3 @@
> +obj-$(CONFIG_VIDEO_OMAP_VIDEOLIB) += omap_voutlib.o
> +obj-$(CONFIG_VIDEO_OMAP_VIDEOOUT) += omap_vout.o
> +
> diff --git a/drivers/media/video/omap/omap_vout.c b/drivers/media/video/omap/omap_vout.c
> new file mode 100644
> index 0000000..841b6d4
> --- /dev/null
> +++ b/drivers/media/video/omap/omap_vout.c
> @@ -0,0 +1,2571 @@
> +/*
> + * drivers/media/video/omap/omap_vout.c
> + *
> + * Copyright (C) 2005-2008 Texas Instruments.
> + *
> + * This file is licensed under the terms of the GNU General Public License
> + * version 2. This program is licensed "as is" without any warranty of any
> + * kind, whether express or implied.
> + *
> + * Leveraged code from the OMAP2 camera driver
> + * Video-for-Linux (Version 2) camera capture driver for
> + * the OMAP24xx camera controller.
> + *
> + * Author: Andy Lowe (source@mvista.com)
> + *
> + * Copyright (C) 2004 MontaVista Software, Inc.
> + * Copyright (C) 2008 Texas Instruments.
> + *
> + * History:
> + * 20-APR-2006 Khasim Modified VRFB based Rotation,
> + * The image data is always read from 0 degree
> + * view and written
> + * to the virtual space of desired rotation angle
> + * 4-DEC-2006 Jian Changed to support better memory management
> + *
> + * 17-Nov-2008 Hardik Changed to used the new DSS paches by Tomi
> + * Changed driver to use video_ioctl2
> + *
> + */
> +
> +#include <linux/init.h>
> +#include <linux/module.h>
> +#include <linux/delay.h>
> +#include <linux/errno.h>
> +#include <linux/fs.h>
> +#include <linux/kernel.h>
> +#include <linux/vmalloc.h>
> +#include <linux/slab.h>
> +#include <linux/sched.h>
> +#include <linux/smp_lock.h>
> +#include <linux/interrupt.h>
> +#include <linux/kdev_t.h>
> +#include <linux/types.h>
> +#include <linux/wait.h>
> +#include <linux/videodev2.h>
> +#include <linux/pci.h>
> +#include <linux/platform_device.h>
> +#include <media/videobuf-dma-sg.h>
> +#include <linux/input.h>
> +#include <linux/dma-mapping.h>
> +#include <media/v4l2-dev.h>
> +#include <media/v4l2-ioctl.h>
> +#include <mach/display.h>
> +#include <linux/io.h>
> +#include <linux/irq.h>
> +#include <linux/semaphore.h>
> +#include <asm/processor.h>
> +#include <mach/dma.h>
> +#include <mach/vrfb.h>
> +#include <mach/display.h>
> +#include "omap_voutlib.h"
> +#include "omap_voutdef.h"
> +
> +#define OMAP_VIDEO1 0
> +#define OMAP_VIDEO2 1
> +
> +#undef DEBUG
> +/*
> + * Uncomment this if debugging support needs to be enabled
> + */
> +/* #define DEBUG */
> +
> +#ifdef DEBUG
> +#define DPRINTK(ARGS...) (printk(KERN_DEBUG "<%s>: ", __func__); \
> + printk(KERN_DEBUG ARGS))
> +#else
> +#define DPRINTK(x...)
> +#endif
> +
> +/* configuration macros */
> +#define VOUT_NAME "omap_vout"
> +
> +#define QQVGA_WIDTH 160
> +#define QQVGA_HEIGHT 120
> +
> +#define NUM_OF_VIDEO_CHANNELS 2
> +
> +#define VID_MAX_WIDTH 1280 /* Largest width */
> +#define VID_MAX_HEIGHT 720/* Largest height */
> +
> +#define VID_MIN_WIDTH 0
> +#define VID_MIN_HEIGHT 0
> +
> +/* 2048 x 2048 is max res supported by OMAP display controller */
> +#define DMA_CHAN_ALLOTED 1
> +#define DMA_CHAN_NOT_ALLOTED 0
> +#define MAX_PIXELS_PER_LINE 2048
> +#define VRFB_TX_TIMEOUT 1000
> +
> +/* VRFB offset computation parameters */
> +#define SIDE_H 1
> +#define SIDE_W 0
> +
> +/* SDRAM page size parameters used for VRFB settings */
> +#define PAGE_WIDTH_EXP 5 /* page width = 1 << PAGE_WIDTH_EXP */
> +#define PAGE_HEIGHT_EXP 5 /* page height = 1 << PAGE_HEIGHT_EXP */
> +
> +/* IRQ Bits mask of DSS */
> +#define OMAP_VOUT_MAX_BUF_SIZE (VID_MAX_WIDTH*VID_MAX_HEIGHT*4)
> +
> +static struct omap_vout_device *saved_v1out, *saved_v2out;
> +
> +#define STREAMING_IS_ON() ((saved_v1out && saved_v1out->streaming) || \
> + (saved_v2out && saved_v2out->streaming))
> +
> +static struct videobuf_queue_ops video_vbq_ops;
> +
> +static u32 video1_numbuffers = 3;
> +static u32 video2_numbuffers = 3;
> +static u32 video1_bufsize = OMAP_VOUT_MAX_BUF_SIZE;
> +static u32 video2_bufsize = OMAP_VOUT_MAX_BUF_SIZE;
> +module_param(video1_numbuffers, uint, S_IRUGO);
> +module_param(video2_numbuffers, uint, S_IRUGO);
> +module_param(video1_bufsize, uint, S_IRUGO);
> +module_param(video2_bufsize, uint, S_IRUGO);
I recommend adding MODULE_PARM_DESC() as well to provide a description of
these module options.
> +
> +static int omap_vout_create_video_devices(struct platform_device *pdev);
> +static int omapvid_apply_changes(struct omap_vout_device *vout, u32 addr,
> + int init);
> +static int omapvid_setup_overlay(struct omap_vout_device *vout,
> + struct omap_overlay *ovl, int posx, int posy,
> + int outw, int outh, u32 addr, int tv_field1_offset, int init);
> +static enum omap_color_mode video_mode_to_dss_mode(struct omap_vout_device
> + *vout);
> +static void omap_vout_isr(void *arg, unsigned int irqstatus);
> +static void omap_vout_cleanup_device(struct omap_vout_device *vout);
> +/* module parameters */
^^^^^^ This comment should be moved up.
> +/*
> + * Maximum amount of memory to use for rendering buffers.
> + * Default is enough to four (RGB24) VGA buffers.
> + */
> +#define MAX_ALLOWED_VIDBUFFERS 4
> +
> +static struct v4l2_queryctrl omap_vout_qctrl[] = {
> + {
> + .id = V4L2_CID_ROTATION,
> + .name = "Rotation",
> + .minimum = 0,
> + .maximum = 270,
> + .step = 90,
> + .default_value = 0,
> + .flags = 0,
> + .type = V4L2_CTRL_TYPE_INTEGER,
> + },
> + {
> + .id = V4L2_CID_BG_COLOR,
> + .name = "Background color",
> + .minimum = 0,
> + .maximum = 16777215,/* 24bit RGB Max Value 2^24-1 */
> + .step = 1,
> + .default_value = 0,
> + .flags = 0,
> + .type = V4L2_CTRL_TYPE_INTEGER,
> + }
I recommend that you use v4l2_ctrl_query_fill: it ensures consistent control
names and types.
> +
> +
> +};
> +
> +/* list of image formats supported by OMAP2 video pipelines */
> +const static struct v4l2_fmtdesc omap_formats[] = {
> + {
> + /* Note: V4L2 defines RGB565 as:
> + *
> + * Byte 0 Byte 1
> + * g2 g1 g0 r4 r3 r2 r1 r0 b4 b3 b2 b1 b0 g5 g4 g3
> + *
> + * We interpret RGB565 as:
> + *
> + * Byte 0 Byte 1
> + * g2 g1 g0 b4 b3 b2 b1 b0 r4 r3 r2 r1 r0 g5 g4 g3
> + */
> + .description = "RGB565, le",
> + .pixelformat = V4L2_PIX_FMT_RGB565,
> + },
> + {
> + /* Note: V4L2 defines RGB32 as: RGB-8-8-8-8 we use
> + * this for RGB24 unpack mode, the last 8 bits are ignored
> + * */
> + .description = "RGB32, le",
> + .pixelformat = V4L2_PIX_FMT_RGB32,
> + },
> + {
> + /* Note: V4L2 defines RGB24 as: RGB-8-8-8 we use
> + * this for RGB24 packed mode
> + *
> + */
> + .description = "RGB24, le",
> + .pixelformat = V4L2_PIX_FMT_RGB24,
> + },
> + {
> + .description = "YUYV (YUV 4:2:2), packed",
> + .pixelformat = V4L2_PIX_FMT_YUYV,
> + },
> + {
> + .description = "UYVY, packed",
> + .pixelformat = V4L2_PIX_FMT_UYVY,
> + },
> +};
> +
> +#define NUM_OUTPUT_FORMATS (sizeof(omap_formats)/sizeof(omap_formats[0]))
> +
> +static unsigned long
> +omap_vout_alloc_buffer(u32 buf_size, u32 *phys_addr)
> +{
> + unsigned long virt_addr, addr;
> + u32 order, size;
> + size = PAGE_ALIGN(buf_size);
> + order = get_order(size);
> + virt_addr = __get_free_pages(GFP_KERNEL | GFP_DMA, order);
> + addr = virt_addr;
> + if (virt_addr) {
> + while (size > 0) {
> + SetPageReserved(virt_to_page(addr));
> + addr += PAGE_SIZE;
> + size -= PAGE_SIZE;
> + }
> + }
> + *phys_addr = (u32) virt_to_phys((void *) virt_addr);
> + return virt_addr;
> +}
> +
> +static void
> +omap_vout_free_buffer(unsigned long virtaddr, u32 phys_addr,
> + u32 buf_size)
> +{
> + unsigned long addr = virtaddr;
> + u32 order, size;
> + size = PAGE_ALIGN(buf_size);
> + order = get_order(size);
> + while (size > 0) {
> + ClearPageReserved(virt_to_page(addr));
> + addr += PAGE_SIZE;
> + size -= PAGE_SIZE;
> + }
> + free_pages((unsigned long) virtaddr, order);
> +}
> +
> +static int omap_vout_try_format(struct v4l2_pix_format *pix,
> + struct v4l2_pix_format *def_pix)
> +{
> + int ifmt, bpp = 0;
> +
> + if (pix->width > VID_MAX_WIDTH)
> + pix->width = VID_MAX_WIDTH;
> + if (pix->height > VID_MAX_HEIGHT)
> + pix->height = VID_MAX_HEIGHT;
> +
> + if (pix->width <= VID_MIN_WIDTH)
> + pix->width = def_pix->width;
> + if (pix->height <= VID_MIN_HEIGHT)
> + pix->height = def_pix->height;
Linux provides some nice clamp macros for this. See linux/kernel.h.
> +
> + for (ifmt = 0; ifmt < NUM_OUTPUT_FORMATS; ifmt++) {
> + if (pix->pixelformat == omap_formats[ifmt].pixelformat)
> + break;
> + }
> +
> + if (ifmt == NUM_OUTPUT_FORMATS)
> + ifmt = 0;
> +
> + pix->pixelformat = omap_formats[ifmt].pixelformat;
> + pix->field = V4L2_FIELD_ANY;
> + pix->priv = 0;
> +
> + switch (pix->pixelformat) {
> + case V4L2_PIX_FMT_YUYV:
> + case V4L2_PIX_FMT_UYVY:
> + default:
> + pix->colorspace = V4L2_COLORSPACE_JPEG;
> + bpp = YUYV_BPP;
> + break;
> + case V4L2_PIX_FMT_RGB565:
> + case V4L2_PIX_FMT_RGB565X:
> + pix->colorspace = V4L2_COLORSPACE_SRGB;
> + bpp = RGB565_BPP;
> + break;
> + case V4L2_PIX_FMT_RGB24:
> + pix->colorspace = V4L2_COLORSPACE_SRGB;
> + bpp = RGB24_BPP;
> + break;
> + case V4L2_PIX_FMT_RGB32:
> + case V4L2_PIX_FMT_BGR32:
> + pix->colorspace = V4L2_COLORSPACE_SRGB;
> + bpp = RGB32_BPP;
> + break;
> + }
> + pix->bytesperline = pix->width * bpp;
> + pix->sizeimage = pix->bytesperline * pix->height;
> + return bpp;
> +}
> +
> +/*
> + * omap_vout_uservirt_to_phys: This inline function is used to convert user
> + * space virtual address to physical address.
> + */
> +static inline u32 omap_vout_uservirt_to_phys(u32 virtp)
> +{
> + unsigned long physp = 0;
> + struct mm_struct *mm = current->mm;
> + struct vm_area_struct *vma;
> +
> + vma = find_vma(mm, virtp);
> + /* For kernel direct-mapped memory, take the easy way */
> + if (virtp >= PAGE_OFFSET) {
> + physp = virt_to_phys((void *) virtp);
> + } else if ((vma) && (vma->vm_flags & VM_IO)
> + && (vma->vm_pgoff)) {
> + /* this will catch, kernel-allocated,
> + mmaped-to-usermode addresses */
> + physp = (vma->vm_pgoff << PAGE_SHIFT) + (virtp - vma->vm_start);
> + } else {
> + /* otherwise, use get_user_pages() for general userland pages */
> + int res, nr_pages = 1;
> + struct page *pages;
> + down_read(¤t->mm->mmap_sem);
> +
> + res = get_user_pages(current, current->mm, virtp, nr_pages,
> + 1, 0, &pages, NULL);
> + up_read(¤t->mm->mmap_sem);
> +
> + if (res == nr_pages) {
> + physp = __pa(page_address(&pages[0]) +
> + (virtp & ~PAGE_MASK));
> + } else {
> + printk(KERN_WARNING "omap_vout_uservirt_to_phys:\
> + get_user_pages failed\n");
> + return 0;
> + }
> + }
> +
> + return physp;
> +}
> +
> +/* This functions wakes up the application once
> + * the DMA transfer to VRFB space is completed. */
> +static void omap_vout_vrfb_dma_tx_callback(int lch, u16 ch_status, void *data)
> +{
> + struct vid_vrfb_dma *t = (struct vid_vrfb_dma *) data;
> + t->tx_status = 1;
> + wake_up_interruptible(&t->wait);
> +}
> +
> +/* Function used to find the VRFB Alignement */
> +static inline u32 pages_per_side(u32 img_side, u32 page_exp)
> +{
> + /* page_side = 2 ^ page_exp
> + * (page_side - 1) is added for rounding up
> + */
> + return (u32) (img_side + (1 << page_exp) - 1) >> page_exp;
> +}
> +
> +/* Buffer setup function is called by videobuf layer when REQBUF ioctl is
> + * called. This is used to setup buffers and return size and count of
> + * buffers allocated. After the call to this buffer, videobuf layer will
> + * setup buffer queue depending on the size and count of buffers
> + */
> +static int omap_vout_buffer_setup(struct videobuf_queue *q, unsigned int *count,
> + unsigned int *size)
> +{
> + struct omap_vout_fh *fh = (struct omap_vout_fh *) q->priv_data;
> + struct omap_vout_device *vout = fh->vout;
> + int startindex = 0, i, j;
> + u32 phy_addr = 0, virt_addr = 0;
> +
> + if (!vout)
> + return -EINVAL;
> +
> + if (V4L2_BUF_TYPE_VIDEO_OUTPUT != q->type)
> + return -EINVAL;
> +
> + startindex = (vout->vid == OMAP_VIDEO1) ?
> + video1_numbuffers : video2_numbuffers;
> + if (V4L2_MEMORY_MMAP == vout->memory && *count < startindex)
> + *count = startindex;
> +
> + if (vout->rotation != -1 && *count > 4)
> + *count = 4;
> +
> + /* If rotation is enabled, allocate memory for VRFB space also */
> + if (vout->rotation >= 0) {
> + for (i = 0; i < *count; i++) {
> + if (!vout->smsshado_virt_addr[i]) {
> + vout->smsshado_virt_addr[i] =
> + omap_vout_alloc_buffer(vout->smsshado_size,
> + &vout->smsshado_phy_addr[i]);
> + }
> +
> + if (!vout->smsshado_virt_addr[i]) {
> + if (V4L2_MEMORY_MMAP == vout->memory
> + && i >= startindex)
> + break;
> + for (j = 0; j < i; j++) {
> + omap_vout_free_buffer(
> + vout->smsshado_virt_addr[j],
> + vout->smsshado_phy_addr[j],
> + vout->smsshado_size);
> + vout->smsshado_virt_addr[j] = 0;
> + vout->smsshado_phy_addr[j] = 0;
> + }
> + *count = 0;
> + return -ENOMEM;
> + }
> +
> + memset((void *) vout->smsshado_virt_addr[i], 0,
> + vout->smsshado_size);
> +
> + if (vout->rotation == 1 || vout->rotation == 3) {
> +
> + omap_vrfb_setup(&vout->vrfb_context[i],
> + vout->smsshado_phy_addr[i],
> + vout->pix.height,
> + vout->pix.width,
> + vout->bpp);
> +
> + } else {
> +
> + omap_vrfb_setup(&vout->vrfb_context[i],
> + vout->smsshado_phy_addr[i],
> + vout->pix.width,
> + vout->pix.height,
> + vout->bpp);
> + }
> + }
> + }
> +
> + if (V4L2_MEMORY_MMAP != vout->memory)
> + return 0;
> +
> + *size = vout->buffer_size;
> + startindex = (vout->vid == OMAP_VIDEO1) ?
> + video1_numbuffers : video2_numbuffers;
> + for (i = startindex; i < *count; i++) {
> + vout->buffer_size = *size;
> +
> + virt_addr = omap_vout_alloc_buffer(vout->buffer_size,
> + &phy_addr);
> + if (!virt_addr) {
> + if (vout->rotation < 0)
> + break;
> + for (j = i; j < *count; j++) {
> + omap_vout_free_buffer(
> + vout->smsshado_virt_addr[j],
> + vout->smsshado_phy_addr[j],
> + vout->smsshado_size);
> + vout->smsshado_virt_addr[j] = 0;
> + vout->smsshado_phy_addr[j] = 0;
> + }
> + }
> + vout->buf_virt_addr[i] = virt_addr;
> + vout->buf_phy_addr[i] = phy_addr;
> + }
> +
> + *count = vout->buffer_allocated = i;
> + return 0;
> +}
> +
> +/* This function will be called when VIDIOC_QBUF ioctl is called.
> + * It prepare buffers before give out for the display. This function
> + * user space virtual address into physical address if userptr memory
> + * exchange mechanism is used. If rotation is enabled, it copies entire
> + * buffer into VRFB memory space before giving it to the DSS.
> + */
> +static int omap_vout_buffer_prepare(struct videobuf_queue *q,
> + struct videobuf_buffer *vb,
> + enum v4l2_field field)
> +{
> + struct omap_vout_fh *fh = (struct omap_vout_fh *) q->priv_data;
> + struct omap_vout_device *vout = fh->vout;
> + u32 dest_frame_index = 0, src_element_index = 0;
> + u32 dest_element_index = 0, src_frame_index = 0;
> + u32 elem_count = 0, frame_count = 0, pixsize = 2;
> + struct videobuf_dmabuf *dmabuf = NULL;
> +
> + if (VIDEOBUF_NEEDS_INIT == vb->state) {
> + vb->width = vout->pix.width;
> + vb->height = vout->pix.height;
> + vb->size = vb->width * vb->height * vout->bpp;
> + vb->field = field;
> + }
> + vb->state = VIDEOBUF_PREPARED;
> + /* if user pointer memory mechanism is used, get the physical
> + * address of the buffer
> + */
> + if (V4L2_MEMORY_USERPTR == vb->memory) {
> + if (0 == vb->baddr)
> + return -EINVAL;
> + /* Virtual address */
> + /* priv points to struct videobuf_pci_sg_memory. But we went
> + * pointer to videobuf_dmabuf, which is member of
> + * videobuf_pci_sg_memory */
> + dmabuf = videobuf_to_dma(q->bufs[vb->i]);
> + dmabuf->vmalloc = (void *) vb->baddr;
> +
> + /* Physical address */
> + dmabuf->bus_addr =
> + (dma_addr_t) omap_vout_uservirt_to_phys(vb->baddr);
> + }
> +
> + if (vout->rotation >= 0) {
> + dmabuf = videobuf_to_dma(q->bufs[vb->i]);
> + /* If rotation is enabled, copy input buffer into VRFB
> + * memory space using DMA. We are copying input buffer
> + * into VRFB memory space of desired angle and DSS will
> + * read image VRFB memory for 0 degree angle
> + */
> + pixsize = vout->bpp * vout->vrfb_bpp;
> + /*
> + * DMA transfer in double index mode
> + */
> +
> + /* Frame index */
> + dest_frame_index = ((MAX_PIXELS_PER_LINE * pixsize) -
> + (vout->pix.width * vout->bpp)) + 1;
> +
> + /* Source and destination parameters */
> + src_element_index = 0;
> + src_frame_index = 0;
> + dest_element_index = 1;
> + /* Number of elements per frame */
> + elem_count = vout->pix.width * vout->bpp;
> + frame_count = vout->pix.height;
> + vout->vrfb_dma_tx.tx_status = 0;
> + omap_set_dma_transfer_params(vout->vrfb_dma_tx.dma_ch,
> + OMAP_DMA_DATA_TYPE_S32,
> + (elem_count / 4), frame_count,
> + OMAP_DMA_SYNC_ELEMENT,
> + vout->vrfb_dma_tx.dev_id,
> + 0x0);
> + /* src_port required only for OMAP1 */
> + omap_set_dma_src_params(vout->vrfb_dma_tx.dma_ch, 0,
> + OMAP_DMA_AMODE_POST_INC,
> + dmabuf->bus_addr,
> + src_element_index,
> + src_frame_index);
> + /*set dma source burst mode for VRFB */
> + omap_set_dma_src_burst_mode(vout->vrfb_dma_tx.dma_ch,
> + OMAP_DMA_DATA_BURST_16);
> + /* dest_port required only for OMAP1 */
> + omap_set_dma_dest_params(vout->vrfb_dma_tx.dma_ch, 0,
> + OMAP_DMA_AMODE_DOUBLE_IDX,
> + vout->vrfb_context[vb->i].paddr[vout->rotation],
> + dest_element_index, dest_frame_index);
> + /*set dma dest burst mode for VRFB */
> + omap_set_dma_dest_burst_mode(vout->vrfb_dma_tx.dma_ch,
> + OMAP_DMA_DATA_BURST_16);
> + omap_dma_set_global_params(DMA_DEFAULT_ARB_RATE, 0x20, 0);
> +
> + omap_start_dma(vout->vrfb_dma_tx.dma_ch);
> + interruptible_sleep_on_timeout(&vout->vrfb_dma_tx.wait,
> + VRFB_TX_TIMEOUT);
> +
> + if (vout->vrfb_dma_tx.tx_status == 0) {
> + omap_stop_dma(vout->vrfb_dma_tx.dma_ch);
> + return -EINVAL;
> + }
> + /* Store buffers physical address into an array. Addresses
> + * from this array will be used to configure DSS */
> + vout->queued_buf_addr[vb->i] = (u8 *)
> + vout->vrfb_context[vb->i].paddr[0];
The else below should be indented one tab to the left.
> + } else {
> + dmabuf = videobuf_to_dma(q->bufs[vb->i]);
> +
> + vout->queued_buf_addr[vb->i] = (u8 *) dmabuf->bus_addr;
> + }
Note this it is better to handle the else part first and return.
Then the large if-part can be handled after that and can be indented
on tab to the left as well.
I.e.:
if (cond) {
// lots of code
} else {
// small amount of code
}
can be rewritten as:
if (!cond) {
// small amount of code
return 0;
}
// lots of code.
> + return 0;
> +}
> +
> +/* Buffer queue funtion will be called from the videobuf layer when _QBUF
> + * ioctl is called. It is used to enqueue buffer, which is ready to be
> + * displayed. */
> +static void omap_vout_buffer_queue(struct videobuf_queue *q,
> + struct videobuf_buffer *vb)
> +{
> + struct omap_vout_fh *fh = (struct omap_vout_fh *) q->priv_data;
> + struct omap_vout_device *vout = fh->vout;
> +
> + /* Driver is also maintainig a queue. So enqueue buffer in the driver
> + * queue */
> + list_add_tail(&vb->queue, &vout->dma_queue);
> +
> + vb->state = VIDEOBUF_PREPARED;
> +}
> +
> +/* Buffer release function is called from videobuf layer to release buffer
> + * which are already allocated */
> +static void omap_vout_buffer_release(struct videobuf_queue *q,
> + struct videobuf_buffer *vb)
> +{
> + struct omap_vout_fh *fh = (struct omap_vout_fh *) q->priv_data;
> + struct omap_vout_device *vout = fh->vout;
> +
> + vb->state = VIDEOBUF_NEEDS_INIT;
> +
> + if (V4L2_MEMORY_MMAP != vout->memory)
> + return;
> +}
> +
> +static int omap_disp_get_vrfb_offset(u32 img_len, u32 bytes_per_pixel, int side)
> +{
> + int page_width_exp, page_height_exp, pixel_size_exp, offset = 0;
> +
> + /* Maximum supported is 4 bytes (RGB32) */
> + if (bytes_per_pixel > 4)
> + return -EINVAL;
> +
> + page_width_exp = PAGE_WIDTH_EXP;
> + page_height_exp = PAGE_HEIGHT_EXP;
> + pixel_size_exp = bytes_per_pixel >> 1;
> +
> + if (side == SIDE_W) {
> + offset = ((1 << page_width_exp) *
> + (pages_per_side(img_len *
> + bytes_per_pixel, page_width_exp))) >> pixel_size_exp;
> + /* in pixels */
> + } else {
> + offset = (1 << page_height_exp) *
> + (pages_per_side(img_len, page_height_exp));
> + }
> +
> + return offset;
> +}
> +EXPORT_SYMBOL(omap_disp_get_vrfb_offset);
> +
> +static int omap_vout_calculate_offset(struct omap_vout_device *vout)
> +{
> + struct v4l2_pix_format *pix = &(vout->pix);
> + struct v4l2_rect *crop = &(vout->crop);
> + struct v4l2_window *win = &(vout->win);
> + int rotation_deg;
> + int mirroring = vout->mirror;
> + int vr_ps = 1, ps = 2, temp_ps = 2;
> + int offset = 0, ctop = 0, cleft = 0, line_length = 0;
> + struct omapvideo_info *ovid;
> + struct omap_overlay *ovl;
> + struct omap_display *cur_display;
> + int *cropped_offset = &(vout->cropped_offset);
> +
> + ovid = &(vout->vid_info);
> + ovl = ovid->overlays[0];
> + /* get the display device attached to the overlay */
> + if (!ovl->manager || !ovl->manager->display)
> + return -1;
> + cur_display = ovl->manager->display;
> +
> + if ((cur_display->type == OMAP_DISPLAY_TYPE_VENC) &&
> + ((win->w.width == crop->width)
> + && (win->w.height == crop->height)))
> + vout->flicker_filter = 1;
> + else
> + vout->flicker_filter = 0;
> +
> + if (1 == vout->mirror && vout->rotation >= 0) {
> + rotation_deg = (vout->rotation == 1) ?
> + 270 : (vout->rotation == 3) ?
> + 90 : (vout->rotation == 2) ?
> + 0 : 180;
Huh? Here you set rotation_deg to 0, 90, 180 or 270,
> +
> + } else if (vout->rotation >= 0) {
> + rotation_deg = vout->rotation;
but here it is 0, 1, 2, 3.
> + } else {
> + rotation_deg = -1;
And isn't -1 the same as 0?
Perhaps this should be an enum? It's definitely confusing here.
> + }
> +
> + if (V4L2_PIX_FMT_YUYV == pix->pixelformat ||
> + V4L2_PIX_FMT_UYVY == pix->pixelformat) {
> + if (rotation_deg >= 0 || mirroring == 1) {
> + /*
> + * ps - Actual pixel size for YUYV/UYVY for
> + * VRFB/Mirroring is 4 bytes
> + * vr_ps - Virtually pixel size for YUYV/UYVY is
> + * 2 bytes
> + */
> + ps = 4;
> + vr_ps = 2;
> + } else {
> + ps = 2; /* otherwise the pixel size is 2 byte */
> + }
> + } else if (V4L2_PIX_FMT_RGB32 == pix->pixelformat) {
> + ps = 4;
> + } else if (V4L2_PIX_FMT_RGB24 == pix->pixelformat) {
> + ps = 3;
> + }
> + vout->ps = ps;
> + vout->vr_ps = vr_ps;
> + if (rotation_deg >= 0) {
> + line_length = MAX_PIXELS_PER_LINE;
> + ctop = (pix->height - crop->height) - crop->top;
> + cleft = (pix->width - crop->width) - crop->left;
> + } else {
> + line_length = pix->width;
> + }
> + vout->line_length = line_length;
> + switch (rotation_deg) {
> + case 1:
> + offset = (omap_disp_get_vrfb_offset(pix->width, ps, SIDE_H) -
> + (pix->width / vr_ps)) * ps * line_length;
> + temp_ps = ps / vr_ps;
> + if (mirroring == 0) {
> + *cropped_offset = offset + line_length *
> + temp_ps * cleft + crop->top * temp_ps;
> + } else {
> + *cropped_offset = offset + line_length * temp_ps *
> + cleft + crop->top * temp_ps + (line_length *
> + ((crop->width / (vr_ps)) - 1) * ps);
> + }
> + break;
> +
> + case 2:
> + offset = (omap_disp_get_vrfb_offset(pix->height, ps, SIDE_H) -
> + pix->height) * ps * line_length +
> + (omap_disp_get_vrfb_offset(pix->width,
> + ps, SIDE_W) - (pix->width / vr_ps)) * ps;
> + if (mirroring == 0) {
> + *cropped_offset = offset + (line_length * ps * ctop) +
> + (cleft / vr_ps) * ps;
> + } else {
> + *cropped_offset = offset + (line_length * ps * ctop) +
> + (cleft / vr_ps) * ps + (line_length *
> + (crop->height - 1) * ps);
> + }
> + break;
> +
> + case 3:
> + offset = (omap_disp_get_vrfb_offset(pix->height, ps, SIDE_W) -
> + pix->height) * ps;
> + temp_ps = ps / vr_ps;
> + if (mirroring == 0) {
> + *cropped_offset = offset + line_length *
> + temp_ps * crop->left + ctop * ps;
> + } else {
> + *cropped_offset = offset + line_length *
> + temp_ps * crop->left + ctop * ps +
> + (line_length * ((crop->width / vr_ps) - 1) *
> + ps);
> + }
> + break;
> + case 0:
> + if (mirroring == 0) {
> + *cropped_offset = (line_length * ps) *
> + crop->top + (crop->left / vr_ps) * ps;
> + } else {
> + *cropped_offset = (line_length * ps) *
> + crop->top + (crop->left / vr_ps) * ps +
> + (line_length * (crop->height - 1) * ps);
> + }
> + break;
> + default:
> + if (mirroring == 0) {
> + *cropped_offset =
> + line_length * ps * crop->top + crop->left * ps;
> + } else {
> + *cropped_offset = (line_length * ps * crop->top) /
> + vr_ps + (crop->left * ps) / vr_ps +
> + ((crop->width / vr_ps) - 1) * ps;
> + }
> + break;
> + }
> +
> + if (vout->flicker_filter == 1)
> + vout->tv_field1_offset = 0;
> + else if (vout->rotation >= 0) {
> + if (vout->mirror == 1)
> + vout->tv_field1_offset = -vout->line_length * vout->ps;
> + else
> + vout->tv_field1_offset = vout->line_length * vout->ps;
> + } else {
> + if (vout->mirror == 1)
> + vout->tv_field1_offset = vout->line_length
> + * vout->ps / vout->vr_ps;
> + else
> + vout->tv_field1_offset = vout->line_length * vout->ps;
> + }
> + return 0;
> +}
> +
> +/*
> + * File operations
> + */
> +static void omap_vout_vm_open(struct vm_area_struct *vma)
> +{
> + struct omap_vout_device *vout = vma->vm_private_data;
> + DPRINTK("vm_open [vma=%08lx-%08lx]\n", vma->vm_start, vma->vm_end);
> + vout->mmap_count++;
> +}
> +
> +static void omap_vout_vm_close(struct vm_area_struct *vma)
> +{
> + struct omap_vout_device *vout = vma->vm_private_data;
> + DPRINTK("vm_close [vma=%08lx-%08lx]\n", vma->vm_start, vma->vm_end);
> + vout->mmap_count--;
> +}
> +
> +static struct vm_operations_struct omap_vout_vm_ops = {
> + .open = omap_vout_vm_open,
> + .close = omap_vout_vm_close,
> +};
> +
> +static int omap_vout_mmap(struct file *file, struct vm_area_struct *vma)
> +{
> + struct omap_vout_fh *fh = file->private_data;
> + struct omap_vout_device *vout = fh->vout;
> + struct videobuf_queue *q = &fh->vbq;
> + unsigned long size = (vma->vm_end - vma->vm_start);
> + unsigned long start = vma->vm_start;
> + int i;
> + void *pos;
> + struct videobuf_dmabuf *dmabuf = NULL;
> +
> + DPRINTK("pgoff=0x%lx, start=0x%lx, end=0x%lx\n", vma->vm_pgoff,
> + vma->vm_start, vma->vm_end);
> +
> + /* look for the buffer to map */
> + for (i = 0; i < VIDEO_MAX_FRAME; i++) {
> + if (NULL == q->bufs[i])
> + continue;
> + if (V4L2_MEMORY_MMAP != q->bufs[i]->memory)
> + continue;
> + if (q->bufs[i]->boff == (vma->vm_pgoff << PAGE_SHIFT))
> + break;
> + }
> +
> + if (VIDEO_MAX_FRAME == i) {
> + DPRINTK("offset invalid [offset=0x%lx]\n",
> + (vma->vm_pgoff << PAGE_SHIFT));
> + return -EINVAL;
> + }
> + q->bufs[i]->baddr = vma->vm_start;
> +
> + vma->vm_flags |= VM_RESERVED;
> + vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot);
> + vma->vm_ops = &omap_vout_vm_ops;
> + vma->vm_private_data = (void *) vout;
> + dmabuf = videobuf_to_dma(q->bufs[i]);
> + pos = dmabuf->vmalloc;
> + while (size > 0) {
> + unsigned long pfn;
> + pfn = virt_to_phys((void *) pos) >> PAGE_SHIFT;
> + if (remap_pfn_range(vma, start, pfn, PAGE_SIZE, PAGE_SHARED))
> + return -EAGAIN;
> + start += PAGE_SIZE;
> + pos += PAGE_SIZE;
> + size -= PAGE_SIZE;
> + }
> +
> + vout->mmap_count++;
> + return 0;
> +}
> +
> +static void omap_vout_free_allbuffers(struct omap_vout_device *vout)
> +{
> + int num_buffers = 0, i;
> + num_buffers = (vout->vid == OMAP_VIDEO1) ?
> + video1_numbuffers : video2_numbuffers;
> + for (i = num_buffers; i < vout->buffer_allocated; i++) {
> + if (vout->buf_virt_addr[i]) {
> + omap_vout_free_buffer(vout->buf_virt_addr[i],
> + vout->buf_phy_addr[i], vout->buffer_size);
> + }
> + vout->buf_virt_addr[i] = 0;
> + vout->buf_phy_addr[i] = 0;
> + }
> + for (i = 0; i < 4; i++) {
> + if (vout->smsshado_virt_addr[i]) {
> + omap_vout_free_buffer(vout->smsshado_virt_addr[i],
> + vout->smsshado_phy_addr[i],
> + vout->smsshado_size);
> + vout->smsshado_virt_addr[i] = 0;
> + vout->smsshado_phy_addr[i] = 0;
> + }
> + }
> + vout->buffer_allocated = num_buffers;
> +}
> +
> +static int omap_vout_release(struct file *file)
> +{
> +
> + struct omap_vout_fh *fh = file->private_data;
> + struct omap_vout_device *vout;
> + struct videobuf_queue *q;
> + unsigned int t;
> + struct omapvideo_info *ovid;
> + unsigned int r;
> +
> + vout = fh->vout;
> + ovid = &(vout->vid_info);
> +
> + if (fh == 0)
> + return 0;
> + if (!vout)
> + return 0;
> + q = &fh->vbq;
> +
> + /* Disable all the overlay managers connected with this interface */
> + for (t = 0; t < ovid->num_overlays; t++) {
> + struct omap_overlay *ovl = ovid->overlays[t];
> + if (ovl->manager && ovl->manager->display) {
> + struct omap_overlay_info info;
> + ovl->get_overlay_info(ovl, &info);
> + info.enabled = 0;
> + ovl->set_overlay_info(ovl, &info);
> + }
> +
> + }
> +
> + r = omapvid_apply_changes(vout, 0, 0);
> + if (r)
> + printk(KERN_WARNING "Unable to apply changes\n");
> +
> + /* Even if apply changes fails we should continue
> + freeing allocated memeory */
> + if (fh->io_allowed) {
> + videobuf_streamoff(q);
> + videobuf_queue_cancel(q);
> + /* Free all buffers */
> + omap_vout_free_allbuffers(vout);
> + videobuf_mmap_free(q);
> + }
> +
> + if (vout->streaming == fh) {
> + u32 mask = 0;
> + mask = DISPC_IRQ_VSYNC | DISPC_IRQ_EVSYNC_EVEN |
> + DISPC_IRQ_EVSYNC_ODD;
> + omap_dispc_unregister_isr(omap_vout_isr, vout, mask);
> + vout->streaming = NULL;
> + }
> +
> + if (vout->mmap_count != 0)
> + vout->mmap_count = 0;
> +
> + vout->opened -= 1;
> + file->private_data = NULL;
> +
> + if (vout->buffer_allocated)
> + videobuf_mmap_free(q);
> +
> + kfree(fh);
> +
> + return r;
> +}
> +
> +static int omap_vout_open(struct file *file)
> +{
> + int minor = video_devdata(file)->minor;
> + struct omap_vout_device *vout = NULL;
> + struct omap_vout_fh *fh;
> + struct videobuf_queue *q;
> +
> + DPRINTK("entering\n");
> +
> + if (saved_v1out && saved_v1out->vfd
> + && (saved_v1out->vfd->minor == minor)) {
> + vout = saved_v1out;
> + }
> +
> + if (vout == NULL) {
> + if (saved_v2out && saved_v2out->vfd
> + && (saved_v2out->vfd->minor == minor)) {
> + vout = saved_v2out;
> + }
> + }
> +
> + if (vout == NULL)
> + return -ENODEV;
> +
> + /* for now, we only support single open */
> + if (vout->opened)
> + return -EBUSY;
> +
> + vout->opened += 1;
> +
> + fh = kmalloc(sizeof(*fh), GFP_KERNEL);
> + if (NULL == fh)
> + return -ENOMEM;
> + memset(fh, 0, sizeof(*fh));
> +
> + file->private_data = fh;
> + fh->vout = vout;
> + fh->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
> +
> + q = &fh->vbq;
> + video_vbq_ops.buf_setup = omap_vout_buffer_setup;
> + video_vbq_ops.buf_prepare = omap_vout_buffer_prepare;
> + video_vbq_ops.buf_release = omap_vout_buffer_release;
> + video_vbq_ops.buf_queue = omap_vout_buffer_queue;
> + spin_lock_init(&vout->vbq_lock);
> +
> + videobuf_queue_sg_init(q, &video_vbq_ops, NULL, &vout->vbq_lock,
> + fh->type, V4L2_FIELD_NONE, sizeof
> + (struct videobuf_buffer), fh);
> +
> + return 0;
> +}
> +
> +static int vidioc_querycap(struct file *file, void *fh,
> + struct v4l2_capability *cap)
> +{
> + struct omap_vout_device *vout = ((struct omap_vout_fh *) fh)->vout;
> +
> + memset(cap, 0, sizeof(*cap));
> + strncpy(cap->driver, VOUT_NAME,
> + sizeof(cap->driver));
> + strncpy(cap->card, vout->vfd->name, sizeof(cap->card));
> + cap->bus_info[0] = '\0';
Use strlcpy, that will guarantee a 0 at the end.
> + cap->capabilities = V4L2_CAP_STREAMING | V4L2_CAP_VIDEO_OUTPUT;
> + return 0;
> +}
> +static int vidioc_enum_fmt_vid_out(struct file *file, void *fh,
> + struct v4l2_fmtdesc *fmt)
> +{
> + int index = fmt->index;
> + enum v4l2_buf_type type = fmt->type;
> +
> + memset(fmt, 0, sizeof(*fmt));
I think most of these memsets are unnecessary since v4l2_ioctl2 does this
for you already.
> + fmt->index = index;
> + fmt->type = type;
> + if (index >= NUM_OUTPUT_FORMATS)
> + return -EINVAL;
> +
> + fmt->flags = omap_formats[index].flags;
> + strncpy(fmt->description, omap_formats[index].description,
> + sizeof(fmt->description));
> + fmt->pixelformat = omap_formats[index].pixelformat;
> + return 0;
> +}
> +static int vidioc_g_fmt_vid_out(struct file *file, void *fh,
> + struct v4l2_format *f)
> +{
> + struct omap_vout_device *vout = ((struct omap_vout_fh *) fh)->vout;
> +
> + struct v4l2_pix_format *pix = &f->fmt.pix;
> + memset(pix, 0, sizeof(*pix));
> + *pix = vout->pix;
> + return 0;
> +
> +}
> +
> +static int vidioc_try_fmt_vid_out(struct file *file, void *fh,
> + struct v4l2_format *f)
> +{
> + struct omap_vout_device *vout = ((struct omap_vout_fh *) fh)->vout;
> + struct omapvideo_info *ovid;
> + struct omap_overlay *ovl;
> + struct omap_video_timings *timing;
> +
> + if (vout->streaming)
> + return -EBUSY;
> +
> + ovid = &(vout->vid_info);
> + ovl = ovid->overlays[0];
> +
> + if (!ovl->manager || !ovl->manager->display)
> + return -EINVAL;
> + /* get the display device attached to the overlay */
> + timing = &ovl->manager->display->panel->timings;
> +
> + vout->fbuf.fmt.height = timing->y_res;
> + vout->fbuf.fmt.width = timing->x_res;
> +
> + omap_vout_try_format(&f->fmt.pix, &vout->fbuf.fmt);
> + return 0;
> +}
> +
> +static int vidioc_s_fmt_vid_out(struct file *file, void *fh,
> + struct v4l2_format *f)
> +{
> + struct omap_vout_fh *ofh = (struct omap_vout_fh *)fh;
> + struct omap_vout_device *vout = ofh->vout;
> + int bpp;
> + int r;
> + struct omapvideo_info *ovid;
> + struct omap_overlay *ovl;
> + struct omap_video_timings *timing;
> +
> + if (vout->streaming)
> + return -EBUSY;
> +
> + if (down_interruptible(&vout->lock))
> + return -EINVAL;
> +
> + ovid = &(vout->vid_info);
> + ovl = ovid->overlays[0];
> +
> + /* get the display device attached to the overlay */
> + if (!ovl->manager || !ovl->manager->display) {
> + up(&vout->lock);
> + return -EINVAL;
> + }
> + timing = &ovl->manager->display->panel->timings;
> +
> + /* We dont support RGB24-packed mode if vrfb rotation
> + * is enabled*/
> + if (vout->rotation != -1
> + && f->fmt.pix.pixelformat == V4L2_PIX_FMT_RGB24) {
> + up(&vout->lock);
> + return -EINVAL;
> + }
> +
> + /* get the framebuffer parameters */
> +
> + if (vout->rotation == 1 || vout->rotation == 3) {
> + vout->fbuf.fmt.height = timing->x_res;
> + vout->fbuf.fmt.width = timing->y_res;
> + } else {
> + vout->fbuf.fmt.height = timing->y_res;
> + vout->fbuf.fmt.width = timing->x_res;
> + }
> +
> + /* change to samller size is OK */
> +
> + bpp = omap_vout_try_format(&f->fmt.pix, &vout->fbuf.fmt);
> + f->fmt.pix.sizeimage = f->fmt.pix.width * f->fmt.pix.height * bpp;
> +
> + /* try & set the new output format */
> + vout->bpp = bpp;
> + vout->pix = f->fmt.pix;
> + vout->vrfb_bpp = 1;
> +
> + /* If YUYV then vrfb bpp is 2, for others its 1 */
> + if (V4L2_PIX_FMT_YUYV == vout->pix.pixelformat ||
> + V4L2_PIX_FMT_UYVY == vout->pix.pixelformat)
> + vout->vrfb_bpp = 2;
> +
> + /* set default crop and win */
> + omap_vout_new_format(&vout->pix, &vout->fbuf, &vout->crop, &vout->win);
> +
> + /* Save the changes in the overlay strcuture */
> + r = omapvid_apply_changes(vout, 0, 0);
> + if (r) {
> + printk(KERN_ERR VOUT_NAME "failed to change mode\n");
> + up(&vout->lock);
> + return -EINVAL;
> + }
> +
> + up(&vout->lock);
> + return 0;
> +}
> +
> +static int vidioc_try_fmt_vid_overlay(struct file *file, void *fh,
> + struct v4l2_format *f)
> +{
> + int err = -EINVAL;
> + struct omap_vout_device *vout = ((struct omap_vout_fh *) fh)->vout;
> + struct v4l2_window *win = &f->fmt.win;
> +
> + err = omap_vout_try_window(&vout->fbuf, win);
> +
> + if (err)
> + return err;
> +
> + if (vout->vid == OMAP_VIDEO1)
> + win->global_alpha = 255;
> + return 0;
> +}
> +
> +static int vidioc_s_fmt_vid_overlay(struct file *file, void *fh,
> + struct v4l2_format *f)
> +{
> + struct omap_vout_device *vout = ((struct omap_vout_fh *) fh)->vout;
> + int err = -EINVAL;
> + struct v4l2_window *win = &f->fmt.win;
> +
> + if (down_interruptible(&vout->lock))
> + return -EINVAL;
> + err = omap_vout_new_window(&vout->crop, &vout->win, &vout->fbuf, win);
> + if (err) {
> + up(&vout->lock);
> + return err;
> + }
> + if (vout->vid == OMAP_VIDEO1)
> + vout->win.global_alpha = 255;
> + else
> + vout->win.global_alpha = f->fmt.win.global_alpha;
> +
> + up(&vout->lock);
> + return 0;
> +}
> +
> +static int vidioc_enum_fmt_vid_overlay(struct file *file, void *fh,
> + struct v4l2_fmtdesc *fmt)
> +{
> + int index = fmt->index;
> + enum v4l2_buf_type type = fmt->type;
> +
> + memset(fmt, 0, sizeof(*fmt));
> + fmt->index = index;
> + fmt->type = type;
> + if (index >= NUM_OUTPUT_FORMATS)
> + return -EINVAL;
> +
> + fmt->flags = omap_formats[index].flags;
> + strncpy(fmt->description, omap_formats[index].description,
> + sizeof(fmt->description));
> + fmt->pixelformat = omap_formats[index].pixelformat;
> + return 0;
> +}
> +
> +static int vidioc_g_fmt_vid_overlay(struct file *file, void *fh,
> + struct v4l2_format *f)
> +{
> + struct omap_vout_device *vout = ((struct omap_vout_fh *) fh)->vout;
> +
> + struct v4l2_window *win = &f->fmt.win;
> + memset(win, 0, sizeof(*win));
> +
> + /*
> + * The API has a bit of a problem here.
> + * We're returning a v4l2_window
> + * structure, but that structure
> + * contains pointers to variable-sized
> + * objects for clipping rectangles and
> + * clipping bitmaps.
> + */
> + win->w = vout->win.w;
> + win->field = vout->win.field;
> + win->chromakey = vout->win.chromakey;
> + win->global_alpha = vout->win.global_alpha;
> + return 0;
> +}
> +
> +static int vidioc_cropcap(struct file *file, void *fh,
> + struct v4l2_cropcap *cropcap)
> +{
> + struct omap_vout_device *vout = ((struct omap_vout_fh *) fh)->vout;
> + enum v4l2_buf_type type = cropcap->type;
> +
> + memset(cropcap, 0, sizeof(*cropcap));
> + cropcap->type = type;
> + if (type == V4L2_BUF_TYPE_VIDEO_OUTPUT) {
> + struct v4l2_pix_format *pix = &vout->pix;
> +
> + /* Width and height are always even */
> + cropcap->bounds.width = pix->width & ~1;
> + cropcap->bounds.height = pix->height & ~1;
> +
> + omap_vout_default_crop(&vout->pix, &vout->fbuf,
> + &cropcap->defrect);
> + cropcap->pixelaspect.numerator = 1;
> + cropcap->pixelaspect.denominator = 1;
> + return 0;
> + } else
> + return -EINVAL;
See my if-else discussion above.
> +}
> +static int vidioc_g_crop(struct file *file, void *fh,
> + struct v4l2_crop *crop)
> +{
> + struct omap_vout_device *vout = ((struct omap_vout_fh *) fh)->vout;
> +
> + if (crop->type == V4L2_BUF_TYPE_VIDEO_OUTPUT) {
> + crop->c = vout->crop;
> + return 0;
> + } else
> + return -EINVAL;
Ditto.
> +}
> +static int vidioc_s_crop(struct file *file, void *fh,
> + struct v4l2_crop *crop)
> +{
> + struct omap_vout_device *vout = ((struct omap_vout_fh *) fh)->vout;
> + int err = -EINVAL;
> + struct omapvideo_info *ovid;
> + struct omap_overlay *ovl;
> + struct omap_video_timings *timing;
> +
> + if (vout->streaming)
> + return -EBUSY;
> +
> + if (down_interruptible(&vout->lock))
> + return -EINVAL;
> +
> + ovid = &(vout->vid_info);
> + ovl = ovid->overlays[0];
> +
> + if (!ovl->manager || !ovl->manager->display) {
> + up(&vout->lock);
> + return -EINVAL;
> + }
> + /* get the display device attached to the overlay */
> + timing = &ovl->manager->display->panel->timings;
> +
> + if (vout->rotation == 1 || vout->rotation == 3) {
> + vout->fbuf.fmt.height = timing->x_res;
> + vout->fbuf.fmt.width = timing->y_res;
> + } else {
> + vout->fbuf.fmt.height = timing->y_res;
> + vout->fbuf.fmt.width = timing->x_res;
> + }
> +
> + if (crop->type == V4L2_BUF_TYPE_VIDEO_OUTPUT) {
> + err = omap_vout_new_crop(&vout->pix, &vout->crop, &vout->win,
> + &vout->fbuf, &crop->c);
> + up(&vout->lock);
> + return err;
> + } else {
> + up(&vout->lock);
> + return -EINVAL;
> + }
> +}
> +
> +static int vidioc_queryctrl(struct file *file, void *fh,
> + struct v4l2_queryctrl *a)
> +{
> + int i;
> +
> + for (i = 0; i < ARRAY_SIZE(omap_vout_qctrl); i++)
> + if (a->id && a->id == omap_vout_qctrl[i].id) {
> + memcpy(a, &omap_vout_qctrl[i],
> + sizeof(struct v4l2_queryctrl));
> + return 0;
> + }
Better to use v4l2_ctrl_query_fill().
> + return -EINVAL;
> +}
> +
> +static int vidioc_g_ctrl(struct file *file, void *fh, struct v4l2_control *a)
> +{
> + int i;
> + struct omap_vout_device *vout = ((struct omap_vout_fh *) fh)->vout;
> +
> + switch (a->id) {
> + case V4L2_CID_ROTATION:
> + {
> + for (i = 0; i < ARRAY_SIZE(omap_vout_qctrl); i++) {
> + if (a->id == vout->control[i].id) {
> + a->value = vout->control[i].value;
> + return 0;
> + }
> + }
> + }
> + case V4L2_CID_BG_COLOR:
> + {
> + struct omapvideo_info *ovid;
> + struct omap_overlay *ovl;
> + unsigned int color;
> + ovid = &(vout->vid_info);
> + ovl = ovid->overlays[0];
> +
> + if (!ovl->manager || !ovl->manager->get_default_color)
> + return -EINVAL;
> +
> + ovl->manager->get_default_color(
> + ovl->manager, &color);
> + a->value = color;
> + for (i = 0; i < ARRAY_SIZE(omap_vout_qctrl); i++) {
> + if (a->id == vout->control[i].id) {
> + vout->control[i].value = color;
> + return 0;
> + }
> + }
> +
> + return 0;
> + }
> +
> + default:
> + return -EINVAL;
> + }
> +}
> +
> +static int vidioc_s_ctrl(struct file *file, void *fh, struct v4l2_control *a)
> +{
> + struct omap_vout_device *vout = ((struct omap_vout_fh *) fh)->vout;
> +
> + switch (a->id) {
> + case V4L2_CID_ROTATION:
> + {
> + int rotation = a->value;
> +
> + if (vout->pix.pixelformat == V4L2_PIX_FMT_RGB24 &&
> + rotation != -1)
> + return -EINVAL;
> + if (down_interruptible(&vout->lock))
> + return -EINVAL;
This lock is only needed inside the if below.
> + if ((rotation == 0) || (rotation == 90) ||
> + (rotation == 180) || (rotation == 270)) {
> + vout->control[0].value = rotation;
> + switch (rotation) {
> + case 90:
> + vout->rotation = 1;
> + break;
> + case 180:
> + vout->rotation = 2;
> + break;
> + case 270:
> + vout->rotation = 3;
> + break;
> + case 0:
> + case -1:
> + vout->rotation = -1;
> + break;
> + default:
> + return -EINVAL;
> +
> + }
> + up(&vout->lock);
> + return 0;
> + } else {
> + up(&vout->lock);
> + return -EINVAL;
> + }
> + }
> + case V4L2_CID_BG_COLOR:
> + {
> + unsigned int color = a->value;
> + struct omapvideo_info *ovid;
> + struct omap_overlay *ovl;
> + ovid = &(vout->vid_info);
> + ovl = ovid->overlays[0];
> +
> + if (down_interruptible(&vout->lock))
> + return -EINVAL;
General note: unless you have a counting semaphore then it is better to use
a mutex. It's simpler and more efficient.
> + if (!ovl->manager || !ovl->manager->set_default_color) {
> + up(&vout->lock);
> + return -EINVAL;
> + }
> +
> + ovl->manager->set_default_color(ovl->manager,
> + color);
> + up(&vout->lock);
> + return 0;
> + }
> +
> + default:
> + return -EINVAL;
> + }
> +
> +}
> +
> +static int vidioc_reqbufs(struct file *file, void *fh,
> + struct v4l2_requestbuffers *req)
> +{
> + struct omap_vout_device *vout = ((struct omap_vout_fh *) fh)->vout;
> + struct videobuf_queue *q = &(((struct omap_vout_fh *) fh)->vbq);
> + unsigned int i, num_buffers = 0;
> + int ret = 0;
> + struct videobuf_dmabuf *dmabuf = NULL;
> +
> + if (down_interruptible(&vout->lock))
> + return -EINVAL;
Move this down two 'ifs' to where it is really needed.
> +
> + if ((req->type != V4L2_BUF_TYPE_VIDEO_OUTPUT) || (req->count < 0)) {
> + up(&vout->lock);
> + return -EINVAL;
> + }
> + /* if memory is not mmp or userptr
> + return error */
> + if ((V4L2_MEMORY_MMAP != req->memory) &&
> + (V4L2_MEMORY_USERPTR != req->memory)) {
> + up(&vout->lock);
> + return -EINVAL;
> + }
> +
> + /* Cannot be requested when streaming is on */
> + if (vout->streaming) {
> + up(&vout->lock);
> + return -EBUSY;
> + }
> +
> + /* If buffers are already allocated free them */
> + if (q->bufs[0] && (V4L2_MEMORY_MMAP == q->bufs[0]->memory)) {
> + if (vout->mmap_count) {
> + up(&vout->lock);
> + return -EBUSY;
> + }
> + num_buffers = (vout->vid == OMAP_VIDEO1) ?
> + video1_numbuffers : video2_numbuffers;
> + for (i = num_buffers; i < vout->buffer_allocated; i++) {
> + dmabuf = videobuf_to_dma(q->bufs[i]);
> + omap_vout_free_buffer((u32)dmabuf->vmalloc,
> + dmabuf->bus_addr, vout->buffer_size);
> + vout->buf_virt_addr[i] = 0;
> + vout->buf_phy_addr[i] = 0;
> + }
> + vout->buffer_allocated = num_buffers;
> + videobuf_mmap_free(q);
> + } else if (q->bufs[0] && (V4L2_MEMORY_USERPTR == q->bufs[0]->memory)) {
> + if (vout->buffer_allocated) {
> + videobuf_mmap_free(q);
> + for (i = 0; i < vout->buffer_allocated; i++) {
> + kfree(q->bufs[i]);
> + q->bufs[i] = NULL;
> + }
> + vout->buffer_allocated = 0;
> + }
> + }
> + ((struct omap_vout_fh *) fh)->io_allowed = 1;
> +
> + /*store the memory type in data structure */
> + vout->memory = req->memory;
> +
> + INIT_LIST_HEAD(&vout->dma_queue);
> +
> + /* call videobuf_reqbufs api */
> + ret = videobuf_reqbufs(q, req);
> + if (ret < 0) {
> + up(&vout->lock);
> + return ret;
> + }
> +
> + vout->buffer_allocated = req->count;
> + for (i = 0; i < req->count; i++) {
> + dmabuf = videobuf_to_dma(q->bufs[i]);
> + dmabuf->vmalloc = (void *) vout->buf_virt_addr[i];
> + dmabuf->bus_addr = (dma_addr_t) vout->buf_phy_addr[i];
> + dmabuf->sglen = 1;
> + }
> + up(&vout->lock);
> + return 0;
> +}
> +static int vidioc_querybuf(struct file *file, void *fh,
> + struct v4l2_buffer *b)
> +{
> + return videobuf_querybuf(&(((struct omap_vout_fh *) fh)->vbq), b);
> +}
> +static int vidioc_qbuf(struct file *file, void *fh,
> + struct v4l2_buffer *buffer)
> +{
> + struct omap_vout_fh *ofh = (struct omap_vout_fh *)fh;
> + struct omap_vout_device *vout = ofh->vout;
> + struct videobuf_queue *q = &ofh->vbq;
> + int ret = 0;
> +
> + if (!ofh->io_allowed)
> + return -EINVAL;
> +
> + if ((V4L2_BUF_TYPE_VIDEO_OUTPUT != buffer->type) ||
> + (buffer->index >= vout->buffer_allocated) ||
> + (q->bufs[buffer->index]->memory != buffer->memory)) {
> + return -EINVAL;
> + }
> + if (V4L2_MEMORY_USERPTR == buffer->memory) {
> + if ((buffer->length < vout->pix.sizeimage) ||
> + (0 == buffer->m.userptr)) {
> + return -EINVAL;
> + }
> + }
> +
> + if (vout->rotation >= 0 &&
> + vout->vrfb_dma_tx.req_status == DMA_CHAN_NOT_ALLOTED) {
> + printk(KERN_WARNING "DMA Channel not allocated for Rotation\n");
> + return -EINVAL;
> + }
> +
> + ret = videobuf_qbuf(q, buffer);
> + return ret;
> +}
> +static int vidioc_dqbuf(struct file *file, void *fh,
> + struct v4l2_buffer *b)
> +{
> + struct omap_vout_fh *ofh = (struct omap_vout_fh *)fh;
> + struct omap_vout_device *vout = ofh->vout;
> + struct videobuf_queue *q = &ofh->vbq;
> + int ret = 0;
> +
> + if (!vout->streaming || !ofh->io_allowed)
> + return -EINVAL;
> +
> + if (file->f_flags & O_NONBLOCK)
> + /* Call videobuf_dqbuf for non blocking mode */
> + ret = videobuf_dqbuf(q, (struct v4l2_buffer *)b, 1);
> + else
> + /* Call videobuf_dqbuf for blocking mode */
> + ret = videobuf_dqbuf(q, (struct v4l2_buffer *)b, 0);
> + return ret;
> +}
> +static int vidioc_streamon(struct file *file, void *fh,
> + enum v4l2_buf_type i)
> +{
> + struct omap_vout_fh *ofh = (struct omap_vout_fh *)fh;
> + struct omap_vout_device *vout = ofh->vout;
> + struct videobuf_queue *q = &ofh->vbq;
> + u32 addr = 0;
> + int r = 0;
> + int t;
> + struct omapvideo_info *ovid = &(vout->vid_info);
> + u32 mask = 0;
> +
> + if (down_interruptible(&vout->lock))
> + return -EINVAL;
> + if (!ofh->io_allowed) {
> + up(&vout->lock);
> + return -EINVAL;
> + }
> +
> + if (vout->streaming) {
> + up(&vout->lock);
> + return -EBUSY;
> + }
> +
> + r = videobuf_streamon(q);
> + if (r < 0) {
> + up(&vout->lock);
> + return r;
> + }
> +
> + if (list_empty(&vout->dma_queue)) {
> + up(&vout->lock);
> + return -EIO;
> + }
> + /* Get the next frame from the buffer queue */
> + vout->nextFrm = vout->curFrm = list_entry(vout->dma_queue.next,
> + struct videobuf_buffer, queue);
> + /* Remove buffer from the buffer queue */
> + list_del(&vout->curFrm->queue);
camelCase! Please replace this with cur_frm and next_frm. Hmm, this gives me
a deja vu :-)
> + /* Mark state of the current frame to active */
> + vout->curFrm->state = VIDEOBUF_ACTIVE;
> + /* Initialize field_id and started member */
> + vout->field_id = 0;
> +
> + /* set flag here. Next QBUF will start DMA */
> + vout->streaming = ofh;
> +
> + vout->first_int = 1;
> +
> + if (omap_vout_calculate_offset(vout)) {
> + up(&vout->lock);
> + return -EINVAL;
> + }
> + addr = (unsigned long) vout->queued_buf_addr[vout->curFrm->i]
> + + vout->cropped_offset;
> +
> + mask = DISPC_IRQ_VSYNC | DISPC_IRQ_EVSYNC_EVEN |
> + DISPC_IRQ_EVSYNC_ODD;
> +
> + omap_dispc_register_isr(omap_vout_isr, vout, mask);
> +
> + for (t = 0; t < ovid->num_overlays; t++) {
> + struct omap_overlay *ovl = ovid->overlays[t];
> + if (ovl->manager && ovl->manager->display) {
> + struct omap_overlay_info info;
> + ovl->get_overlay_info(ovl, &info);
> + info.enabled = 1;
> + ovl->set_overlay_info(ovl, &info);
> + }
> + }
> +
> + r = omapvid_apply_changes(vout, addr, 0);
> + if (r)
> + printk(KERN_ERR VOUT_NAME "failed to change mode\n");
> +
> + up(&vout->lock);
> + return 0;
> +}
> +static int vidioc_streamoff(struct file *file, void *fh,
> + enum v4l2_buf_type i)
> +{
> +
> + struct omap_vout_fh *ofh = (struct omap_vout_fh *)fh;
> + struct omap_vout_device *vout = ofh->vout;
> + int t, r = 0;
> + struct omapvideo_info *ovid = &(vout->vid_info);
> + u32 mask = 0;
> +
> + if (!ofh->io_allowed)
> + return -EINVAL;
> + if (!vout->streaming)
> + return -EINVAL;
> + if (vout->streaming == fh) {
> + vout->streaming = NULL;
> + mask = DISPC_IRQ_VSYNC | DISPC_IRQ_EVSYNC_EVEN |
> + DISPC_IRQ_EVSYNC_ODD;
> +
> + omap_dispc_unregister_isr(omap_vout_isr, vout, mask);
> +
> + for (t = 0; t < ovid->num_overlays; t++) {
> + struct omap_overlay *ovl = ovid->overlays[t];
> + if (ovl->manager && ovl->manager->display) {
> + struct omap_overlay_info info;
> +
> + ovl->get_overlay_info(ovl, &info);
> + info.enabled = 0;
> + return ovl->set_overlay_info(ovl, &info);
> + }
> + }
> +
> + r = omapvid_apply_changes(vout, 0, 0);
> + if (r) {
> + printk(KERN_ERR VOUT_NAME "failed to change mode\n");
> + return r;
> + }
> + }
> + return 0;
> +}
> +
> +static int vidioc_s_fbuf(struct file *file, void *fh,
> + struct v4l2_framebuffer *a)
> +{
> + struct omap_vout_fh *ofh = (struct omap_vout_fh *)fh;
> + struct omap_vout_device *vout = ofh->vout;
> + struct omapvideo_info *ovid;
> + struct omap_overlay *ovl;
> + enum omap_dss_color_key_type key_type = OMAP_DSS_COLOR_KEY_GFX_DST;
> + int enable = 0;
> +
> + ovid = &(vout->vid_info);
> + ovl = ovid->overlays[0];
> +
> + /* OMAP DSS doesn't support Source and Destination color
> + key together */
> + if ((a->flags & V4L2_FBUF_FLAG_SRC_CHROMAKEY) &&
> + (a->flags & V4L2_FBUF_FLAG_CHROMAKEY))
> + return -EINVAL;
> + /* OMAP DSS Doesn't support the Destination color key
> + and alpha blending together */
> + if (a->flags & V4L2_FBUF_FLAG_CHROMAKEY &&
> + (a->flags & V4L2_FBUF_FLAG_LOCAL_ALPHA))
> + return -EINVAL;
> +
> + if ((a->flags & V4L2_FBUF_FLAG_SRC_CHROMAKEY)) {
> + vout->fbuf.flags |= V4L2_FBUF_FLAG_SRC_CHROMAKEY;
> + key_type = OMAP_DSS_COLOR_KEY_VID_SRC;
> + } else
> + vout->fbuf.flags &= ~V4L2_FBUF_FLAG_SRC_CHROMAKEY;
> +
> + if ((a->flags & V4L2_FBUF_FLAG_CHROMAKEY)) {
> + vout->fbuf.flags |= V4L2_FBUF_FLAG_CHROMAKEY;
> + key_type = OMAP_DSS_COLOR_KEY_GFX_DST;
> + } else
> + vout->fbuf.flags &= ~V4L2_FBUF_FLAG_CHROMAKEY;
> +
> + if (a->flags & (V4L2_FBUF_FLAG_CHROMAKEY |
> + V4L2_FBUF_FLAG_SRC_CHROMAKEY))
> + enable = 1;
> + else
> + enable = 0;
> + if (ovl->manager && ovl->manager->enable_trans_key &&
> + ovl->manager->set_trans_key) {
> + ovl->manager->enable_trans_key(ovl->manager, enable);
> + ovl->manager->set_trans_key(ovl->manager, key_type,
> + vout->win.chromakey);
> + }
> + if (a->flags & V4L2_FBUF_FLAG_LOCAL_ALPHA) {
> + vout->fbuf.flags |= V4L2_FBUF_FLAG_LOCAL_ALPHA;
> + enable = 1;
> + } else if (!(a->flags & V4L2_FBUF_FLAG_LOCAL_ALPHA)) {
> + vout->fbuf.flags &= ~V4L2_FBUF_FLAG_LOCAL_ALPHA;
> + enable = 0;
> + }
> + if (ovl->manager && ovl->manager->enable_alpha_blending)
> + ovl->manager->enable_alpha_blending(ovl->manager, enable);
> +
> + return 0;
> +}
> +
> +static int vidioc_g_fbuf(struct file *file, void *fh,
> + struct v4l2_framebuffer *a)
> +{
> + struct omap_vout_fh *ofh = (struct omap_vout_fh *)fh;
> + struct omap_vout_device *vout = ofh->vout;
> +
> + a->flags = 0x0;
> + a->capability = 0x0;
> +
> + a->capability = V4L2_FBUF_CAP_LOCAL_ALPHA | V4L2_FBUF_CAP_CHROMAKEY
> + | V4L2_FBUF_CAP_SRC_CHROMAKEY;
> +
> + if (vout->fbuf.flags & V4L2_FBUF_FLAG_CHROMAKEY)
> + a->flags |= V4L2_FBUF_FLAG_CHROMAKEY;
> + if (vout->fbuf.flags & V4L2_FBUF_FLAG_LOCAL_ALPHA)
> + a->flags |= V4L2_FBUF_FLAG_LOCAL_ALPHA;
> + if (vout->fbuf.flags & V4L2_FBUF_FLAG_SRC_CHROMAKEY)
> + a->flags |= V4L2_FBUF_FLAG_SRC_CHROMAKEY;
> +
> + return 0;
> +}
> +
> +static const struct v4l2_ioctl_ops vout_ioctl_ops = {
> + .vidioc_querycap = vidioc_querycap,
> + .vidioc_querycap = vidioc_querycap,
> + .vidioc_enum_fmt_vid_out = vidioc_enum_fmt_vid_out,
> + .vidioc_g_fmt_vid_out = vidioc_g_fmt_vid_out,
> + .vidioc_try_fmt_vid_out = vidioc_try_fmt_vid_out,
> + .vidioc_s_fmt_vid_out = vidioc_s_fmt_vid_out,
> + .vidioc_queryctrl = vidioc_queryctrl,
> + .vidioc_g_ctrl = vidioc_g_ctrl,
> + .vidioc_s_fbuf = vidioc_s_fbuf,
> + .vidioc_g_fbuf = vidioc_g_fbuf,
> + .vidioc_s_ctrl = vidioc_s_ctrl,
> + .vidioc_try_fmt_vid_overlay = vidioc_try_fmt_vid_overlay,
> + .vidioc_s_fmt_vid_overlay = vidioc_s_fmt_vid_overlay,
> + .vidioc_enum_fmt_vid_overlay = vidioc_enum_fmt_vid_overlay,
> + .vidioc_g_fmt_vid_overlay = vidioc_g_fmt_vid_overlay,
> + .vidioc_cropcap = vidioc_cropcap,
> + .vidioc_g_crop = vidioc_g_crop,
> + .vidioc_s_crop = vidioc_s_crop,
> + .vidioc_reqbufs = vidioc_reqbufs,
> + .vidioc_querybuf = vidioc_querybuf,
> + .vidioc_qbuf = vidioc_qbuf,
> + .vidioc_dqbuf = vidioc_dqbuf,
> + .vidioc_streamon = vidioc_streamon,
> + .vidioc_streamoff = vidioc_streamoff,
> +};
> +static struct v4l2_file_operations omap_vout_fops = {
> + .owner = THIS_MODULE,
> + .ioctl = video_ioctl2,
> + .mmap = omap_vout_mmap,
> + .open = omap_vout_open,
> + .release = omap_vout_release,
> +};
> +
> +static int omap_vout_remove(struct platform_device *pdev)
> +{
> +
> + struct omap2video_device *vid_dev = platform_get_drvdata(pdev);
> + int k;
> +
> + for (k = 0; k < pdev->num_resources; k++)
> + omap_vout_cleanup_device(vid_dev->vouts[k]);
> +
> + for (k = 0; k < vid_dev->num_displays; k++) {
> + if (vid_dev->displays[k]->state != OMAP_DSS_DISPLAY_DISABLED)
> + vid_dev->displays[k]->disable(vid_dev->displays[k]);
> +
> + omap_dss_put_display(vid_dev->displays[k]);
> + }
> + kfree(vid_dev);
> + return 0;
> +}
> +
> +static int omap_vout_probe(struct platform_device *pdev)
> +{
> + int r = 0, i, t;
> + struct omap2video_device *vid_dev = NULL;
> + struct omap_overlay *ovl;
> + struct omap_display *def_display;
> +
> + if (pdev->num_resources == 0) {
> + dev_err(&pdev->dev, "probed for an unknown device\n");
> + r = -ENODEV;
> + return r;
> + }
> +
> + vid_dev = kzalloc(sizeof(struct omap2video_device), GFP_KERNEL);
> + if (vid_dev == NULL) {
> + r = -ENOMEM;
> + return r;
> + }
> +
> + platform_set_drvdata(pdev, vid_dev);
> +
> + vid_dev->num_displays = 0;
> + t = omap_dss_get_num_displays();
> + for (i = 0; i < t; i++) {
> + struct omap_display *display;
> + display = omap_dss_get_display(i);
> + if (!display) {
> + dev_err(&pdev->dev, "probed for an unknown device\n");
> + r = -EINVAL;
> + goto error0;
> + }
> + vid_dev->displays[vid_dev->num_displays++] = display;
> + }
> +
> + if (vid_dev->num_displays == 0) {
> + dev_err(&pdev->dev, "probed for an unknown device\n");
> + r = -EINVAL;
> + goto error0;
> + }
> +
> + vid_dev->num_overlays = omap_dss_get_num_overlays();
> + for (i = 0; i < vid_dev->num_overlays; i++)
> + vid_dev->overlays[i] = omap_dss_get_overlay(i);
> +
> + vid_dev->num_managers = omap_dss_get_num_overlay_managers();
> + for (i = 0; i < vid_dev->num_managers; i++)
> + vid_dev->managers[i] = omap_dss_get_overlay_manager(i);
> +
> + /* Get the Video1 overlay and video2 overlay.
> + * Setup the Display attached to that overlays
> + */
> + for (i = 1; i < 3; i++) {
> + ovl = omap_dss_get_overlay(i);
> + if (ovl->manager && ovl->manager->display) {
> + def_display = ovl->manager->display;
> + } else {
> + dev_err(&pdev->dev, "probed for an unknown device\n");
> + r = -EINVAL;
> + goto error0;
> + }
> + r = def_display->enable(def_display);
> + if (r) {
> + /* Here we are not considering a error as display may be
> + enabled by frame buffer driver */
> + printk(KERN_WARNING "Display already enabled\n");
> + }
> + /* set the update mode */
> + if (def_display->caps & OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE) {
> +#ifdef CONFIG_FB_OMAP2_FORCE_AUTO_UPDATE
> + if (def_display->set_update_mode)
> + def_display->set_update_mode(def_display,
> + OMAP_DSS_UPDATE_AUTO);
> + if (def_display->enable_te)
> + def_display->enable_te(def_display, 1);
> +#else
> + if (def_display->set_update_mode)
> + def_display->set_update_mode(def_display,
> + OMAP_DSS_UPDATE_MANUAL);
> + if (def_display->enable_te)
> + def_display->enable_te(def_display, 0);
> +#endif
> + } else {
> + if (def_display->set_update_mode)
> + def_display->set_update_mode(def_display,
> + OMAP_DSS_UPDATE_AUTO);
> + }
> + }
> +
> + r = omap_vout_create_video_devices(pdev);
> + if (r)
> + goto error0;
> +
> + for (i = 0; i < vid_dev->num_displays; i++) {
> + struct omap_display *display = vid_dev->displays[i];
> +
> + if (display->update)
> + display->update(display, 0, 0,
> + display->panel->timings.x_res,
> + display->panel->timings.y_res);
> + }
> + printk(KERN_INFO "display->updated\n");
> + return 0;
> +
> +error0:
> + kfree(vid_dev);
> + return r;
> +}
> +
> +static void omap_vout_release_vrfb(struct omap_vout_device *vout)
> +{
> + int i;
> +
> + for (i = 0; i < 4; i++)
> + omap_vrfb_release_ctx(&vout->vrfb_context[i]);
> +
> + if (vout->vrfb_dma_tx.req_status == DMA_CHAN_ALLOTED) {
> + vout->vrfb_dma_tx.req_status = DMA_CHAN_NOT_ALLOTED;
> + omap_free_dma(vout->vrfb_dma_tx.dma_ch);
> + }
> +
> +}
> +
> +static void omap_vout_free_buffers(struct omap_vout_device *vout)
> +{
> + int i, numbuffers;
> + /* Allocate memory for the buffes */
> + numbuffers = (vout->vid) ? video2_numbuffers : video1_numbuffers;
> + vout->buffer_size = (vout->vid) ? video2_bufsize : video1_bufsize;
> +
> + for (i = 0; i < numbuffers; i++) {
> + omap_vout_free_buffer(vout->buf_virt_addr[i],
> + vout->buf_phy_addr[i], vout->buffer_size);
> + vout->buf_phy_addr[i] = 0;
> + vout->buf_virt_addr[i] = 0;
> + }
> +}
> +
> +static int omap_vout_setup_video_data(struct omap_vout_device *vout)
> +{
> + struct v4l2_pix_format *pix;
> + struct video_device *vfd;
> + struct v4l2_control *control;
> + struct omap_display *display =
> + vout->vid_info.overlays[0]->manager->display;
> +
> + /* set the default pix */
> + pix = &vout->pix;
> +
> + /* Set the default picture of QVGA */
> + pix->width = QQVGA_WIDTH;
> + pix->height = QQVGA_HEIGHT;
> +
> + /* Default pixel format is RGB 5-6-5 */
> + pix->pixelformat = V4L2_PIX_FMT_RGB565;
> + pix->field = V4L2_FIELD_ANY;
> + pix->bytesperline = pix->width * 2;
> + pix->sizeimage = pix->bytesperline * pix->height;
> + pix->priv = 0;
> + pix->colorspace = V4L2_COLORSPACE_JPEG;
> +
> + vout->bpp = RGB565_BPP;
> + vout->fbuf.fmt.width = display->panel->timings.x_res;
> + vout->fbuf.fmt.height = display->panel->timings.y_res;
> +
> + /* Set the data structures for the overlay parameters*/
> + vout->win.global_alpha = 255;
> + vout->fbuf.flags = 0;
> + vout->fbuf.capability = V4L2_FBUF_CAP_LOCAL_ALPHA |
> + V4L2_FBUF_CAP_SRC_CHROMAKEY | V4L2_FBUF_CAP_CHROMAKEY;
> + vout->win.chromakey = 0;
> +
> + omap_vout_new_format(pix, &vout->fbuf, &vout->crop, &vout->win);
> +
> + /*Disable the rotation. */
> + control = vout->control;
> +
> + control[0].id = V4L2_CID_ROTATION;
> + control[0].value = 0;
> + vout->rotation = -1;
> + vout->vrfb_bpp = 2;
> +
> + control[1].id = V4L2_CID_BG_COLOR;
> + control[1].value = 0;
> +
> +
> + /* initialize the video_device struct */
> + vfd = vout->vfd = video_device_alloc();
> +
> + if (!vfd) {
> + printk(KERN_ERR VOUT_NAME ": could not allocate\
> + video device struct\n");
> + return -ENOMEM;
> + }
> + vfd->release = video_device_release;
> + vfd->ioctl_ops = &vout_ioctl_ops;
> +
> + strncpy(vfd->name, VOUT_NAME, sizeof(vfd->name));
> + vfd->vfl_type = VID_TYPE_OVERLAY | VID_TYPE_CHROMAKEY;
> +
> + /* need to register for a VID_HARDWARE_* ID in videodev.h */
> + vfd->fops = &omap_vout_fops;
> + init_MUTEX(&vout->lock);
> +
> + vfd->minor = -1;
> + return 0;
> +
> +}
> +static int omap_vout_setup_video_bufs(struct platform_device *pdev, int vid_num)
> +{
> + struct omap2video_device *vid_dev = platform_get_drvdata(pdev);
> + struct omap_vout_device *vout;
> + int i, j, r = 0;
> + int image_width, image_height;
> + unsigned numbuffers;
> + struct video_device *vfd;
> +
> + vout = vid_dev->vouts[vid_num];
> + vfd = vout->vfd;
> +
> + numbuffers = (vid_num == 0) ? video1_numbuffers : video2_numbuffers;
> + vout->buffer_size = (vid_num == 0) ? video1_bufsize : video2_bufsize;
> + printk(KERN_INFO "Buffer Size = %d\n", vout->buffer_size);
> + for (i = 0; i < numbuffers; i++) {
> + vout->buf_virt_addr[i] =
> + omap_vout_alloc_buffer(vout->buffer_size,
> + (u32 *) &vout->buf_phy_addr[i]);
> + if (!vout->buf_virt_addr[i]) {
> + numbuffers = i;
> + r = -ENOMEM;
> + goto free_buffers;
> + }
> + }
> +
> + for (i = 0; i < 4; i++) {
> +
> + if (omap_vrfb_request_ctx(&vout->vrfb_context[i])) {
> + printk(KERN_INFO VOUT_NAME ": VRFB Region allocation \
> + for rotation failed\n");
> + r = -ENOMEM;
> + break;
> + }
> + }
> + if (r == -ENOMEM) {
> + for (j = 0; j < i; j++)
> + omap_vrfb_release_ctx(&vout->vrfb_context[j]);
> +
> + goto free_buffers;
> + }
> +
> + vout->cropped_offset = 0;
> +
> + /* Calculate VRFB memory size */
> + /* allocate for worst case size */
> + image_width = VID_MAX_WIDTH / TILE_SIZE;
> + if (VID_MAX_WIDTH % TILE_SIZE)
> + image_width++;
> +
> + image_width = image_width * TILE_SIZE;
> + image_height = VID_MAX_HEIGHT / TILE_SIZE;
> +
> + if (VID_MAX_HEIGHT % TILE_SIZE)
> + image_height++;
> +
> + image_height = image_height * TILE_SIZE;
> + vout->smsshado_size = PAGE_ALIGN(image_width * image_height * 2 * 2);
> +
> + /*
> + * Request and Initialize DMA, for DMA based VRFB transfer
> + */
> + vout->vrfb_dma_tx.dev_id = OMAP_DMA_NO_DEVICE;
> + vout->vrfb_dma_tx.dma_ch = -1;
> + vout->vrfb_dma_tx.req_status = DMA_CHAN_ALLOTED;
> + r = omap_request_dma(vout->vrfb_dma_tx.dev_id, "VRFB DMA TX",
> + omap_vout_vrfb_dma_tx_callback,
> + (void *) &vout->vrfb_dma_tx, &vout->vrfb_dma_tx.dma_ch);
> + if (r < 0) {
> + vout->vrfb_dma_tx.req_status = DMA_CHAN_NOT_ALLOTED;
> + printk(KERN_INFO VOUT_NAME ": DMA Channel not alloted\
> + for video%d [v4l2]\n", vfd->minor);
> + }
> + init_waitqueue_head(&vout->vrfb_dma_tx.wait);
> +
> + return 0;
> +
> +free_buffers:
> + for (i = 0; i < numbuffers; i++) {
> + omap_vout_free_buffer(vout->buf_virt_addr[i],
> + vout->buf_phy_addr[i], vout->buffer_size);
> + vout->buf_virt_addr[i] = 0;
> + vout->buf_phy_addr[i] = 0;
> + }
> + return r;
> +
> +}
> +
> +static int omap_vout_create_video_devices(struct platform_device *pdev)
> +{
> + int r = 0, k;
> + struct omap_vout_device *vout;
> + struct video_device *vfd = NULL;
> + struct omap2video_device *vid_dev = platform_get_drvdata(pdev);
> +
> + for (k = 0; k < pdev->num_resources; k++) {
> +
> + vout = kmalloc(sizeof(struct omap_vout_device), GFP_KERNEL);
> + if (!vout) {
> + printk(KERN_ERR VOUT_NAME ": could not allocate \
> + memory\n");
> + return -ENOMEM;
> + }
> +
> + memset(vout, 0, sizeof(struct omap_vout_device));
> +
> + vout->vid = k;
> + vid_dev->vouts[k] = vout;
> + vout->vid_info.vid_dev = vid_dev;
> + vout->vid_info.overlays[0] = vid_dev->overlays[k + 1];
> + vout->vid_info.num_overlays = 1;
> + vout->vid_info.id = k + 1;
> + vid_dev->num_videos++;
> +
> + /* Setup the default configuration for the video devices
> + */
> + if (omap_vout_setup_video_data(vout) != 0) {
> + r = -ENOMEM;
> + goto error;
> + }
> +
> + /* Allocate default number of buffers for the video streaming
> + * and reserve the VRFB space for rotation
> + */
> + if (omap_vout_setup_video_bufs(pdev, k) != 0) {
> + r = -ENOMEM;
> + goto error1;
> + }
> +
> + /* Register the Video device with V4L2
> + */
> + vfd = vout->vfd;
> + if (video_register_device(vfd, VFL_TYPE_GRABBER, k + 1) < 0) {
> + printk(KERN_ERR VOUT_NAME ": could not register \
> + Video for Linux device\n");
> + vfd->minor = -1;
> + r = -ENODEV;
> + goto error2;
> + }
> +
> + if (k == 0)
> + saved_v1out = vout;
> + else
> + saved_v2out = vout;
> +
> + r = omapvid_apply_changes(vid_dev->vouts[k], 0, 1);
> +
> + if (r)
> + goto error2;
> + else
> + goto success;
> +error2:
> + omap_vout_release_vrfb(vout);
> + omap_vout_free_buffers(vout);
> +error1:
> + video_device_release(vfd);
> +error:
> + kfree(vout);
> + return r;
> +
> +success:
> + printk(KERN_INFO VOUT_NAME ": registered and initialized\
> + video device %d [v4l2]\n", vfd->minor);
> + if (k == (pdev->num_resources - 1))
> + return 0;
> + }
> + return -ENODEV;
> +
> +}
> +
> +int omapvid_apply_changes(struct omap_vout_device *vout, u32 addr, int init)
> +{
> + int r = 0;
> + struct omapvideo_info *ovid = &(vout->vid_info);
> + struct omap_overlay *ovl;
> + int posx, posy;
> + int outw, outh, temp, rotation;
> + int i;
> + struct v4l2_window *win;
> + struct omap_video_timings *timing;
> + struct omap_display *cur_display;
> +
> + win = &vout->win;
> + rotation = vout->rotation;
> + for (i = 0; i < ovid->num_overlays; i++) {
> + ovl = ovid->overlays[i];
> + if (!ovl->manager || !ovl->manager->display)
> + return -EINVAL;
> +
> + timing = &ovl->manager->display->panel->timings;
> + cur_display = ovl->manager->display;
> +
> + if (init || (ovl->caps & OMAP_DSS_OVL_CAP_SCALE) == 0) {
> + outw = win->w.width;
> + outh = win->w.height;
> +
> + } else {
> + outw = win->w.width;
> + outh = win->w.height;
> + }
> + if (init) {
> + posx = 0;
> + posy = 0;
> + } else {
> + switch (rotation) {
> +
> + case 1:
> + /* Invert the height and widht for 90
> + * and 270 degree rotation
> + */
> + temp = outw;
> + outw = outh;
> + outh = temp;
> + posy = (timing->y_res - win->w.width)-
> + win->w.left;
> + posx = win->w.top;
> + break;
> +
> + case 2:
> + posx = (timing->x_res - win->w.width) -
> + win->w.left;
> + posy = (timing->y_res - win->w.height) -
> + win->w.top;
> + break;
> +
> + case 3:
> + temp = outw;
> + outw = outh;
> + outh = temp;
> + posy = win->w.left;
> + posx = (timing->x_res - win->w.height)
> + - win->w.top;
> + break;
> +
> + default:
> + posx = win->w.left;
> + posy = win->w.top;
> + break;
> + }
> + }
> +
> + if (cur_display->type == OMAP_DISPLAY_TYPE_VENC)
> + posy = posy/2;
> +
> + r = omapvid_setup_overlay(vout, ovl, posx, posy, outw,
> + outh, addr, vout->tv_field1_offset, init);
> + if (r)
> + goto err;
> +
> + if (!init && ovl->manager)
> + ovl->manager->apply(ovl->manager);
> +
> + }
> + return 0;
> +err:
> + printk(KERN_WARNING "apply_changes failed\n");
> + return r;
> +}
> +
> +int omapvid_setup_overlay(struct omap_vout_device *vout,
> + struct omap_overlay *ovl, int posx, int posy, int outw,
> + int outh, u32 addr, int tv_field1_offset, int init)
> +{
> + int r = 0;
> + enum omap_color_mode mode = 0;
> + int rotation, mirror;
> + int cropheight, cropwidth, pixheight, pixwidth;
> + struct omap_overlay_info info;
> +
> + if ((ovl->caps & OMAP_DSS_OVL_CAP_SCALE) == 0 &&
> + (outw != vout->pix.width || outh != vout->pix.height)) {
> + r = -EINVAL;
> + goto err;
> + }
> +
> + mode = video_mode_to_dss_mode(vout);
> +
> + if (mode == -EINVAL) {
> + r = -EINVAL;
> + goto err;
> + }
> +
> + rotation = vout->rotation;
> + mirror = 0;
> +
> + /* Setup the input plane parameters according to
> + * rotation value selected.
> + */
> + if (rotation == 1 || rotation == 3) {
> + cropheight = vout->crop.width;
> + cropwidth = vout->crop.height;
> + pixheight = vout->pix.width;
> + pixwidth = vout->pix.height;
> + } else {
> + cropheight = vout->crop.height;
> + cropwidth = vout->crop.width;
> + pixheight = vout->pix.height;
> + pixwidth = vout->pix.width;
> + }
> +
> + ovl->get_overlay_info(ovl, &info);
> + info.paddr = addr;
> + info.vaddr = NULL;
> + if (vout->rotation >= 0)
> + info.screen_width = 2048;
> + else
> + info.screen_width = pixwidth;
> + info.width = cropwidth;
> + info.height = cropheight;
> + info.color_mode = mode;
> + info.rotation = rotation;
> + info.mirror = mirror;
> + info.pos_x = posx;
> + info.pos_y = posy;
> + info.out_width = outw;
> + info.out_height = outh;
> + info.rotation = 0;
> + info.mirror = 0;
> + info.global_alpha = vout->win.global_alpha;
> +
> + r = ovl->set_overlay_info(ovl, &info);
> + if (r)
> + goto err;
> +
> + return 0;
> +err:
> + printk(KERN_WARNING "setup_overlay failed\n");
> + return r;
> +}
> +
> +static enum omap_color_mode video_mode_to_dss_mode(struct omap_vout_device
> + *vout)
> +{
> + struct v4l2_pix_format *pix = &vout->pix;
> + switch (pix->pixelformat) {
> +
> + case 0:
> + break;
> + case V4L2_PIX_FMT_YUYV:
> + return OMAP_DSS_COLOR_YUV2;
> +
> + case V4L2_PIX_FMT_UYVY:
> + return OMAP_DSS_COLOR_UYVY;
> +
> + case V4L2_PIX_FMT_RGB565:
> + return OMAP_DSS_COLOR_RGB16;
> +
> + case V4L2_PIX_FMT_RGB24:
> + return OMAP_DSS_COLOR_RGB24P;
> +
> + case V4L2_PIX_FMT_RGB32:
> + {
> + if (vout->vid == OMAP_VIDEO1)
> + return OMAP_DSS_COLOR_RGB24U;
> + else
> + return OMAP_DSS_COLOR_ARGB32;
> + }
> + case V4L2_PIX_FMT_BGR32:
> + return OMAP_DSS_COLOR_RGBX32;
> +
> + default:
> + return -EINVAL;
> + }
> + return -EINVAL;
> +}
> +
> +static struct platform_driver omap_vout_driver = {
> + .driver = {
> + .name = VOUT_NAME,
> + },
> + .probe = omap_vout_probe,
> + .remove = omap_vout_remove,
> +};
> +
> +void omap_vout_isr(void *arg, unsigned int irqstatus)
> +{
> + int r;
> + struct timeval timevalue;
> + struct omap_vout_device *vout =
> + (struct omap_vout_device *) arg;
> + u32 addr, fid;
> + struct omapvideo_info *ovid;
> + struct omap_overlay *ovl;
> + struct omap_display *cur_display;
> +
> + if (!vout->streaming)
> + return;
> +
> + ovid = &(vout->vid_info);
> + ovl = ovid->overlays[0];
> + /* get the display device attached to the overlay */
> + if (!ovl->manager || !ovl->manager->display)
> + return;
> + cur_display = ovl->manager->display;
> +
> + spin_lock(&vout->vbq_lock);
> + do_gettimeofday(&timevalue);
> + if (cur_display->type == OMAP_DISPLAY_TYPE_DPI) {
> + if (!(irqstatus & DISPC_IRQ_VSYNC))
> + return;
> + if (!vout->first_int && (vout->curFrm != vout->nextFrm)) {
> + vout->curFrm->ts = timevalue;
> + vout->curFrm->state = VIDEOBUF_DONE;
> + wake_up_interruptible(&vout->curFrm->done);
> + vout->curFrm = vout->nextFrm;
> + }
> + vout->first_int = 0;
> + if (list_empty(&vout->dma_queue)) {
> + spin_unlock(&vout->vbq_lock);
> + return;
> + }
> +
> + vout->nextFrm = list_entry(vout->dma_queue.next,
> + struct videobuf_buffer, queue);
> + list_del(&vout->nextFrm->queue);
> +
> + vout->nextFrm->state = VIDEOBUF_ACTIVE;
> +
> + addr = (unsigned long) vout->queued_buf_addr[vout->nextFrm->i] +
> + vout->cropped_offset ;
> +
> + r = omapvid_apply_changes(vout, addr, 0);
> + if (r)
> + printk(KERN_ERR VOUT_NAME "failed to change mode\n");
> + } else {
> + if (vout->first_int) {
> + vout->first_int = 0;
> + spin_unlock(&vout->vbq_lock);
> + return;
> + }
> + if (irqstatus & DISPC_IRQ_EVSYNC_ODD) {
> + fid = 1;
> + } else if (irqstatus & DISPC_IRQ_EVSYNC_EVEN) {
> + fid = 0;
> + } else {
> + spin_unlock(&vout->vbq_lock);
> + return;
> + }
> + vout->field_id ^= 1;
> + if (fid != vout->field_id) {
> + if (0 == fid)
> + vout->field_id = fid;
> +
> + spin_unlock(&vout->vbq_lock);
> + return;
> + }
> + if (0 == fid) {
> + if (vout->curFrm == vout->nextFrm) {
> + spin_unlock(&vout->vbq_lock);
> + return;
> + }
> + vout->curFrm->ts = timevalue;
> + vout->curFrm->state = VIDEOBUF_DONE;
> + wake_up_interruptible(&vout->curFrm->done);
> + vout->curFrm = vout->nextFrm;
> + } else if (1 == fid) {
> + if (list_empty(&vout->dma_queue) ||
> + (vout->curFrm != vout->nextFrm)) {
> + spin_unlock(&vout->vbq_lock);
> + return;
> + }
> + vout->nextFrm = list_entry(vout->dma_queue.next,
> + struct videobuf_buffer, queue);
> + list_del(&vout->nextFrm->queue);
> +
> + vout->nextFrm->state = VIDEOBUF_ACTIVE;
> + addr = (unsigned long)
> + vout->queued_buf_addr[vout->nextFrm->i] +
> + vout->cropped_offset ;
> + r = omapvid_apply_changes(vout, addr, 0);
> + if (r)
> + printk(KERN_ERR VOUT_NAME "failed to\
> + change mode\n");
> + }
> +
> + }
> + spin_unlock(&vout->vbq_lock);
> +}
> +
> +static void omap_vout_cleanup_device(struct omap_vout_device *vout)
> +{
> +
> + struct video_device *vfd;
> +
> + if (!vout)
> + return;
> + vfd = vout->vfd;
> +
> + if (vfd) {
> + if (vfd->minor == -1) {
> + /*
> + * The device was never registered, so release the
> + * video_device struct directly.
> + */
> + video_device_release(vfd);
> + } else {
> + /*
> + * The unregister function will release the video_device
> + * struct as well as unregistering it.
> + */
> + video_unregister_device(vfd);
> + }
> + }
> +
> + omap_vout_release_vrfb(vout);
> +
> + omap_vout_free_buffers(vout);
> +
> + kfree(vout);
> +
> + if (!(vout->vid))
> + saved_v1out = NULL;
> + else
> + saved_v2out = NULL;
> +}
> +
> +static int __init omap_vout_init(void)
> +{
> +
> + if (platform_driver_register(&omap_vout_driver) != 0) {
> + printk(KERN_ERR VOUT_NAME ": could not register \
> + Video driver\n");
> + return -EINVAL;
> + }
> + return 0;
> +}
> +
> +static void omap_vout_cleanup(void)
> +{
> + platform_driver_unregister(&omap_vout_driver);
> +}
> +
> +MODULE_AUTHOR("Texas Instruments.");
> +MODULE_DESCRIPTION("OMAP Video for Linux Video out driver");
> +MODULE_LICENSE("GPL");
> +
> +late_initcall(omap_vout_init);
> +module_exit(omap_vout_cleanup);
A general remark: the rotate code needs to be improved a bit: the mix of
0, 1, 2, 3 and -1 and 0, 90, 180, 270 is very confusing. Stick to one way
of doing this internally. The extra value of -1 also makes it hard to
understand: what's so special about that value? Often the rotate code is
also a substantial part of a function: see if you can split such functions
into two parts.
Regards,
Hans
--
Hans Verkuil - video4linux developer - sponsored by TANDBERG
next prev parent reply other threads:[~2009-03-30 13:06 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-20 5:20 [PATCH 3/3] V4L2 Driver for OMAP3/3 DSS Hardik Shah
2009-03-20 9:04 ` Koen Kooi
2009-03-20 9:08 ` Shah, Hardik
2009-03-20 12:23 ` Alexey Klimov
2009-03-20 12:41 ` Shah, Hardik
2009-03-20 12:32 ` Alexey Klimov
2009-03-20 12:40 ` Shah, Hardik
2009-03-30 13:06 ` Hans Verkuil [this message]
2009-03-30 13:18 ` Shah, Hardik
2009-04-06 11:51 ` Shah, Hardik
2009-04-06 14:57 Hans Verkuil
2009-04-15 13:34 ` Shah, Hardik
2009-04-15 13:44 Hans Verkuil
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200903301506.36134.hverkuil@xs4all.nl \
--to=hverkuil@xs4all.nl \
--cc=brijesh.j@ti.com \
--cc=hardik.shah@ti.com \
--cc=hvaibhav@ti.com \
--cc=linux-media@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).