Hi Hans, My Comments inlined, Most of the comments are taken care off. Thanks for review. Hardik, > -----Original Message----- > From: Hans Verkuil [mailto:hverkuil@xxxxxxxxx] > Sent: Saturday, April 18, 2009 7:29 PM > To: Shah, Hardik > Cc: linux-media@xxxxxxxxxxxxxxx; linux-omap@xxxxxxxxxxxxxxx; Jadav, Brijesh R; > Hiremath, Vaibhav > Subject: Re: [Review PATCH 3/3] OMAP2/3 V4L2 Display Driver > > On Monday 06 April 2009 14:40:54 Hardik Shah wrote: > > This is the version 4th of the driver. Most of the community comments > > are addressed. > > > > 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 > > http://www.bat.org/~tomba/git/linux-omap-dss.git/ > > 10. 1/4x scaling added. Detail testing left > > > > TODOS > > 1. Flipping support to be added. > > 2. Rotation needs to add for YUV and UYVY formats. > > 3. Ioctls needs to added for color space conversion matrix > > coefficient programming. > > 4. To be tested on DVI resolutions. > > 5. Add S_OUTPUT and S_STD ioctls and corresponding G_ versions. > > Supported through compile time option on current post. > > > > Community comments fixed. > > 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. > > > > Community comments fixed in this post > > 4. Added proper copyright year. > > 5. Added module name in printk > > 6. Kconfig option copy/paste error > > 7. Module param desc addded. > > 8. Query control implemented using standard query_fill > > 9. Re-arranged if-else constructs. > > 10. Changed to use mutex instead of semaphore. > > 11. Removed dual usage of rotation angles. > > 12. Implemented function to convert the V4L2 angle to DSS angle. > > 13. Y-position was set half by video driver for TV output > > Now its done by DSS so removed that from V4L2 driver > > 14. Minor cleanup > > 15. Added support to pass the page offset to application. > > 16. Renamed V4L2_CID_ROTATION to V4L2_CID_ROTATE > > 17. Major comments from Hans fixed. > > > > Signed-off-by: Brijesh Jadav <brijesh.j@xxxxxx> > > Signed-off-by: Hardik Shah <hardik.shah@xxxxxx> > > Signed-off-by: Vaibhav Hiremath <hvaibhav@xxxxxx> > > --- > > arch/arm/mach-omap2/board-omap3evm.c | 18 +- > > drivers/media/video/Kconfig | 13 + > > drivers/media/video/Makefile | 4 + > > drivers/media/video/omap/Kconfig | 60 + > > drivers/media/video/omap/Makefile | 3 + > > drivers/media/video/omap/omap_vout.c | 2532 > +++++++++++++++++++++++++++++++ > > drivers/media/video/omap/omap_voutdef.h | 137 ++ > > drivers/media/video/omap/omap_voutlib.c | 265 ++++ > > drivers/media/video/omap/omap_voutlib.h | 34 + > > 9 files changed, 3064 insertions(+), 2 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 fb2f9ee..c48c571 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_dss_display_config > 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) { > > @@ -433,6 +445,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..cf041a6 100644 > > --- a/drivers/media/video/Kconfig > > +++ b/drivers/media/video/Kconfig > > @@ -711,6 +711,19 @@ config VIDEO_CAFE_CCIC > > CMOS camera controller. This is the controller found on first- > > generation OLPC systems. > > > > +config VIDEO_OMAP3 > > +#Right now camera is not merged but in future will be merged with camera > > This comment makes no sense :-) [Shah, Hardik] Removed > > > + 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 > > Terminology: PAL and NTSC etc. refer to broadcast standards. That is no > generally applicable to omap. When it comes to streaming digital video > there is only the 50 and 60 Hz SDTV standards. For output over a Composite > or S-Video connector you can also choose between PAL and SECAM. There > are some differences between the two, although I'm not sure about the > details. The common saa7128 i2c device definitely has support for both. > > In this particular case you probably mean 50 or 60 Hz SDTV rather than > NTSC/PAL. > [Shah, Hardik] OMAP DSS is having the internal video encoder for converting the digital to analog standards like NTSC and PAL with a s-video and composite output. Currently DSS does not support changing of the TV standards dynamically so I have made it as a compile time option. Once DSS will support that I will add the S_STD and G_STD for standards. Internally it will call the DSS2 library APIs to change the standard. > > + > > +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..0e0796a > > --- /dev/null > > +++ b/drivers/media/video/omap/omap_vout.c > > @@ -0,0 +1,2532 @@ > > +/* > > + * drivers/media/video/omap/omap_vout.c > > + * > > + * Copyright (C) 2005-2009 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@xxxxxxxxxx) > > + * > > + * Copyright (C) 2004 MontaVista Software, Inc. > > + * Copyright (C) 2009 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 <media/v4l2-common.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 > > This might be better as a debug module option. [Shah, Hardik] Done. > > > + > > +/* 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 parameters */ > > +module_param(video1_numbuffers, uint, S_IRUGO); > > +MODULE_PARM_DESC(video1_numbuffers, "Number of buffers to be allocated at \ > > + init time for Video1 device."); > > + > > +module_param(video2_numbuffers, uint, S_IRUGO); > > +MODULE_PARM_DESC(video2_numbuffers, "Number of buffers to be allocated at \ > > + init time for Video2 device."); > > + > > +module_param(video1_bufsize, uint, S_IRUGO); > > +MODULE_PARM_DESC(video1_bufsize, "Size of the buffer to be allocated for \ > > + video1 device"); > > + > > +module_param(video2_bufsize, uint, S_IRUGO); > > +MODULE_PARM_DESC(video2_bufsize, "Size of the buffer to be allocated for \ > > + video2 device"); > > + > > +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); > > + > > +/* > > + * Maximum amount of memory to use for rendering buffers. > > + * Default is enough to four (RGB24) DVI 720P buffers. > > + */ > > +#define MAX_ALLOWED_VIDBUFFERS 4 > > + > > +/* 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; > > I don't understand this. What are you attempting to do? Since MIN_WIDTH is 0, > I'd say that what you really are doing here is to replace the special value 0 > by the framebuffer size. Other values are apparently still allowed, including > sizes that are larger than the framebuffer. Is there a reason for the special > handling of 0? And is a size of e.g. 1x1 really allowed? > > The name MIN_WIDTH was very misleading to me, since that normally implies a > true minimum size and not a 0 value. [Shah, Hardik] Minimum width supported by the DSS is 2X2 so changed minimum values changed to 2X2. > > > + if (pix->height <= VID_MIN_HEIGHT) > > + pix->height = def_pix->height; > > + > > + 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 VOUT_NAME > > + "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; > > +} > > +/* Allocate the buffers for the VRFB space. Data is copied from V4L2 > > + * buffers to the VRFB buffers using the DMA engine.*/ > > +static int omap_vout_vrfb_buffer_setup(struct omap_vout_device *vout, > > + unsigned int *count, unsigned int startindex) > > +{ > > + int i, j; > > + 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) { > > Add a small inline function like this: > > static inline int rotate_90_or_270(int rotation) > { > return rotation == 1 || rotation == 3; > } > > and use it where applicable. It's shorter and clearer than checking against > these magic numbers. [Shah, Hardik] Done. > > > + omap_vrfb_setup(&vout->vrfb_context[i], > > + vout->smsshado_phy_addr[i], > > + vout->pix.height, vout->pix.width, > > + vout->bpp * vout->vrfb_bpp); > > + > > + } else { > > + omap_vrfb_setup(&vout->vrfb_context[i], > > + vout->smsshado_phy_addr[i], > > + vout->pix.width, vout->pix.height, > > + vout->bpp * vout->vrfb_bpp); > > + } > > + } > > + return 0; > > +} > > + > > +/* 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; > > As I mentioned earlier: wouldn't it be better to write a small inline function > like this: > > /* return true if we need to rotate or mirror, return false if we > don't have to do anything here. */ > static inline int needs_rotate(struct foo *foo) > { > return foo->rotate != 0 || foo->mirror; > } > > I think this is much more understandable. It's up to you, though. [Shah, Hardik] Rotation needs to be enabled if we want mirroring. So just checking of whether rotation is enabled or not will do the job. Done that way. > > > + > > + /* If rotation is enabled, allocate memory for VRFB space also */ > > + if (vout->rotation >= 0) { > > + if (omap_vout_vrfb_buffer_setup(vout, count, startindex)) > > + return -ENOMEM; > > + } > > + > > + if (V4L2_MEMORY_MMAP != vout->memory) > > + return 0; > > + > > + /* Now allocated the V4L2 buffers */ > > + *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; > > + /* Free the VRFB buffers if no space for V4L2 buffers */ > > + 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]); > > + > > + vout->queued_buf_addr[vb->i] = (u8 *) dmabuf->bus_addr; > > + return 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]; > > + 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 v4l2_rot_to_dss_rot(int v4l2_rotation, int *dss_rotation, > > + int mirror) > > +{ > > + if ((v4l2_rotation == 0) || (v4l2_rotation == 90) || > > + (v4l2_rotation == 180) || (v4l2_rotation == 270)) { > > + switch (v4l2_rotation) { > > Both an 'if' and a 'switch' is overkill. Just the switch is sufficient! > > > + case 90: > > + *dss_rotation = 1; > > + return 0; > > + case 180: > > + *dss_rotation = 2; > > + return 0; > > + case 270: > > + *dss_rotation = 3; > > + return 0; > > + case 0: > > + if (mirror) > > + *dss_rotation = 0; > > + else > > + *dss_rotation = -1; > > + return 0; > > + default: > > + return -EINVAL; > > + } > > + } else > > + return -EINVAL; > > +} > > + > > +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; > > +} > > + > > +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; > > Just 'rotation' since it is not in degrees. [Shah, Hardik] changed. > > > + 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) ? > > + 3 : (vout->rotation == 3) ? > > + 1 : (vout->rotation == 2) ? > > + 0 : 2; > > Or: rotation = (4 - vout->rotation) % 4; [Shah, Hardik] It will not work when rotation will be 0 and I want 2 because of mirroring. (4-0) % 2 is 0 I want 2 here. So not changing it. > > > + > > + } else if (vout->rotation >= 0) { > > + rotation_deg = vout->rotation; > > + } else { > > + rotation_deg = -1; > > + } > > + > > + 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; > > + vma->vm_pgoff = virt_to_phys((void *)pos) >> PAGE_SHIFT; > > + 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 VOUT_NAME "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; > > + } > > Yuck. It's much better to use video_set_drvdata when registering the > video_devices and let the drvdata point to struct omap_vout_device. > No need to do any comparisons against minors, just call video_drvdata(file). [Shah, Hardik] I did not know this. Implemented. > > > + > > + 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; > > videobuf_queue should be part of omap_vout_device, not of the omap_vout_fh. > Sadly many v4l2 drivers do it like this, but it is wrong. [Shah, Hardik] Done. > > > + 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; > > + > > + strlcpy(cap->driver, VOUT_NAME, > > + sizeof(cap->driver)); > > + strlcpy(cap->card, vout->vfd->name, sizeof(cap->card)); > > + cap->bus_info[0] = '\0'; > > + 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; > > + > > + fmt->index = index; > > + fmt->type = type; > > + if (index >= NUM_OUTPUT_FORMATS) > > + return -EINVAL; > > + > > + fmt->flags = omap_formats[index].flags; > > + strlcpy(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; > > + *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; > > + > > + mutex_lock(&vout->lock); > > + > > + ovid = &(vout->vid_info); > > + ovl = ovid->overlays[0]; > > + > > + /* get the display device attached to the overlay */ > > + if (!ovl->manager || !ovl->manager->display) { > > + mutex_unlock(&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) { > > + mutex_unlock(&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"); > > + mutex_unlock(&vout->lock); > > + return -EINVAL; > > + } > > + mutex_unlock(&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; > > + > > + mutex_lock(&vout->lock); > > + err = omap_vout_new_window(&vout->crop, &vout->win, &vout->fbuf, win); > > + if (err) { > > + mutex_unlock(&vout->lock); > > + return err; > > + } > > + if (vout->vid == OMAP_VIDEO1) > > + vout->win.global_alpha = 255; > > + else > > + vout->win.global_alpha = f->fmt.win.global_alpha; > > + > > + mutex_unlock(&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; > > + > > + fmt->index = index; > > + fmt->type = type; > > + if (index >= NUM_OUTPUT_FORMATS) > > + return -EINVAL; > > + > > + fmt->flags = omap_formats[index].flags; > > + strlcpy(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; > > + > > + /* > > + * 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. > > + */ > > Why would this be a problem? This comment seems to be out-of-place. [Shah, Hardik] Done > > > + 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; > > + struct v4l2_pix_format *pix = &vout->pix; > > + > > + cropcap->type = type; > > + if (type != V4L2_BUF_TYPE_VIDEO_OUTPUT) > > + return -EINVAL; > > + > > + /* 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; > > +} > > +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) > > + return -EINVAL; > > + crop->c = vout->crop; > > + return 0; > > +} > > +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; > > + > > + mutex_lock(&vout->lock); > > + ovid = &(vout->vid_info); > > + ovl = ovid->overlays[0]; > > + > > + if (!ovl->manager || !ovl->manager->display) { > > + mutex_unlock(&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); > > + mutex_unlock(&vout->lock); > > + return err; > > + } else { > > + mutex_unlock(&vout->lock); > > + return -EINVAL; > > + } > > +} > > + > > +static int vidioc_queryctrl(struct file *file, void *fh, > > + struct v4l2_queryctrl *ctrl) > > +{ > > + switch (ctrl->id) { > > + case V4L2_CID_ROTATE: > > + v4l2_ctrl_query_fill(ctrl, 0, 270, 90, 0); > > + break; > > + case V4L2_CID_BG_COLOR: > > + v4l2_ctrl_query_fill(ctrl, 0, 0xFFFFFF, 1, 0); > > + break; > > + default: > > + ctrl->name[0] = '\0'; > > + return -EINVAL; > > + > > + } > > + return 0; > > +} > > + > > +static int vidioc_g_ctrl(struct file *file, void *fh, struct v4l2_control > *ctrl) > > +{ > > + struct omap_vout_device *vout = ((struct omap_vout_fh *) fh)->vout; > > + > > + switch (ctrl->id) { > > + case V4L2_CID_ROTATE: > > + ctrl->value = vout->control[0].value; > > Missing break. [Shah, Hardik] Done > > + 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); > > + ctrl->value = color; > > + } > > + > > + default: > > + return -EINVAL; > > + } > > + return 0; > > +} > > + > > +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_ROTATE: > > + { > > + int rotation = a->value; > > + > > + if (vout->pix.pixelformat == V4L2_PIX_FMT_RGB24 && > > + rotation != -1) > > Huh? Shouldn't this be rotation != 0? [Shah, Hardik] Rotation 0 means the rotation using Virtual Frame Buffer Rotation (VRFB) engine. It does not support rotation with packed RGB24 format. -1 means VRFB is not used. So it should be -1; > > > + return -EINVAL; > > + mutex_lock(&vout->lock); > > + if ((v4l2_rot_to_dss_rot(rotation, &vout->rotation, > > + vout->mirror))) { > > + mutex_unlock(&vout->lock); > > + return -EINVAL; > > + } > > + vout->control[0].value = rotation; > > + mutex_unlock(&vout->lock); > > + return 0; > > + } > > + 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]; > > + > > + mutex_lock(&vout->lock); > > + if (!ovl->manager || !ovl->manager->set_default_color) { > > + mutex_unlock(&vout->lock); > > + return -EINVAL; > > + } > > + > > + ovl->manager->set_default_color(ovl->manager, > > + color); > > + vout->control[1].value = color; > > + mutex_unlock(&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 ((req->type != V4L2_BUF_TYPE_VIDEO_OUTPUT) || (req->count < 0)) > > + return -EINVAL; > > + /* if memory is not mmp or userptr > > + return error */ > > + if ((V4L2_MEMORY_MMAP != req->memory) && > > + (V4L2_MEMORY_USERPTR != req->memory)) > > + return -EINVAL; > > + > > + mutex_lock(&vout->lock); > > + /* Cannot be requested when streaming is on */ > > + if (vout->streaming) { > > + mutex_unlock(&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) { > > + mutex_unlock(&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) { > > + mutex_unlock(&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; > > + } > > + mutex_unlock(&vout->lock); > > + return 0; > > +} > > Please add empty lines between functions. This happens multiple times in this > source. [Shah, Hardik] Done > > > +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 VOUT_NAME > > + "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; > > + > > + mutex_lock(&vout->lock); > > + if (!ofh->io_allowed) { > > + mutex_unlock(&vout->lock); > > + return -EINVAL; > > + } > > + > > + if (vout->streaming) { > > + mutex_unlock(&vout->lock); > > + return -EBUSY; > > + } > > + > > + r = videobuf_streamon(q); > > + if (r < 0) { > > + mutex_unlock(&vout->lock); > > + return r; > > + } > > + > > + if (list_empty(&vout->dma_queue)) { > > + mutex_unlock(&vout->lock); > > + return -EIO; > > + } > > + /* Get the next frame from the buffer queue */ > > + vout->next_frm = vout->cur_frm = list_entry(vout->dma_queue.next, > > + struct videobuf_buffer, queue); > > + /* Remove buffer from the buffer queue */ > > + list_del(&vout->cur_frm->queue); > > + /* Mark state of the current frame to active */ > > + vout->cur_frm->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)) { > > + mutex_unlock(&vout->lock); > > + return -EINVAL; > > + } > > + addr = (unsigned long) vout->queued_buf_addr[vout->cur_frm->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]; > > Also add empty lines after a declaring local variables. It makes it easier > to read. This is done multiple times in this source. > > > + 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"); > > + > > + mutex_unlock(&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; > > No need to cast void pointers. This too happens multiple times. [Shah, Hardik] Done. > > > + 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; > > And we set it again below?! [Shah, Hardik] Done > > > + > > + 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, > > Duplicate. [Shah, Hardik] done > > > + .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 = { > > Should be static const. [Shah, Hardik] Done > > > + .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 VOUT_NAME > > + "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 VOUT_NAME "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_ROTATE; > > + 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; > > + > > + strlcpy(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; > > + mutex_init(&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 VOUT_NAME "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) > > I think that it is better to make two versions of this function: > > int omapvid_init(struct omap_vout_device *vout, u32 addr) > > and > > int omapvid_apply_changes(struct omap_vout_device *vout, u32 addr) > > There is very little overlap between the two and that makes this function > hard to read. [Shah, Hardik] Done. > > > +{ > > + 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; > > + } > > + } > > + > > + 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 VOUT_NAME "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) > > Note: init isn't used. [Shah, Hardik] Removed. > > > +{ > > + 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 VOUT_NAME "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) { > > + > > Superfluous empty line. [Shah, Hardik] Removed > > > + 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: > > + { > > Why this curly bracket? > > > + if (vout->vid == OMAP_VIDEO1) > > + return OMAP_DSS_COLOR_RGB24U; > > + else > > 'else' is not needed. Actually, using ? : here is probably better. [Shah, Hardik] Done > > > + 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->cur_frm != vout->next_frm)) { > > + vout->cur_frm->ts = timevalue; > > + vout->cur_frm->state = VIDEOBUF_DONE; > > + wake_up_interruptible(&vout->cur_frm->done); > > + vout->cur_frm = vout->next_frm; > > + } > > + vout->first_int = 0; > > + if (list_empty(&vout->dma_queue)) { > > + spin_unlock(&vout->vbq_lock); > > + return; > > + } > > + > > + vout->next_frm = list_entry(vout->dma_queue.next, > > + struct videobuf_buffer, queue); > > + list_del(&vout->next_frm->queue); > > + > > + vout->next_frm->state = VIDEOBUF_ACTIVE; > > + > > + addr = (unsigned long) vout->queued_buf_addr[vout->next_frm->i] > > + + vout->cropped_offset ; > > Remove space before the ';' [Shah, Hardik] Done > > > + > > + 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->cur_frm == vout->next_frm) { > > + spin_unlock(&vout->vbq_lock); > > + return; > > + } > > + vout->cur_frm->ts = timevalue; > > + vout->cur_frm->state = VIDEOBUF_DONE; > > + wake_up_interruptible(&vout->cur_frm->done); > > + vout->cur_frm = vout->next_frm; > > + } else if (1 == fid) { > > + if (list_empty(&vout->dma_queue) || > > + (vout->cur_frm != vout->next_frm)) { > > + spin_unlock(&vout->vbq_lock); > > + return; > > + } > > + vout->next_frm = list_entry(vout->dma_queue.next, > > + struct videobuf_buffer, queue); > > + list_del(&vout->next_frm->queue); > > + > > + vout->next_frm->state = VIDEOBUF_ACTIVE; > > + addr = (unsigned long) > > + vout->queued_buf_addr[vout->next_frm->i] + > > + vout->cropped_offset ; > > Ditto. [Shah, Hardik] Done > > > + r = omapvid_apply_changes(vout, addr, 0); > > + if (r) > > + printk(KERN_ERR VOUT_NAME "failed to\ > > + change mode\n"); > > Just put this at one line. [Shah, Hardik] Done > > > + } > > + > > + } > > + 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); > > diff --git a/drivers/media/video/omap/omap_voutdef.h > b/drivers/media/video/omap/omap_voutdef.h > > new file mode 100644 > > index 0000000..a04c7be > > --- /dev/null > > +++ b/drivers/media/video/omap/omap_voutdef.h > > @@ -0,0 +1,137 @@ > > +/* > > + * drivers/media/video/omap/omap_voutdef.h > > + * > > + * Copyright (C) 2009 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. > > + */ > > + > > +#ifndef OMAP_VOUTDEF_H > > +#define OMAP_VOUTDEF_H > > + > > +#include <mach/display.h> > > + > > +#define YUYV_BPP 2 > > +#define RGB565_BPP 2 > > +#define RGB24_BPP 3 > > +#define RGB32_BPP 4 > > +#define TILE_SIZE 32 > > +#define YUYV_VRFB_BPP 2 > > +#define RGB_VRFB_BPP 1 > > +#define MAX_CID 3 > > + > > + > > +/* > > + * This structure is used to store the DMA transfer parameters > > + * for VRFB hidden buffer > > + */ > > +struct vid_vrfb_dma { > > + int dev_id; > > + int dma_ch; > > + int req_status; > > + int tx_status; > > + wait_queue_head_t wait; > > +}; > > + > > +struct omapvideo_info { > > + int id; > > + int num_overlays; > > + struct omap_overlay *overlays[3]; > > + struct omap2video_device *vid_dev; > > +}; > > + > > +struct omap2video_device { > > + struct device *dev; > > + struct mutex mtx; > > + > > + int state; > > + > > + int num_videos; > > + struct omap_vout_device *vouts[10]; > > + > > + int num_displays; > > + struct omap_display *displays[10]; > > + int num_overlays; > > + struct omap_overlay *overlays[10]; > > + int num_managers; > > + struct omap_overlay_manager *managers[10]; > > +}; > > + > > +/* per-device data structure */ > > +struct omap_vout_device { > > + > > + struct omapvideo_info vid_info; > > + struct device dev; > > + struct video_device *vfd; > > + int vid; > > + int opened; > > + > > + /* we don't allow to change image fmt/size once buffer has > > + * been allocated > > + */ > > + int buffer_allocated; > > + /* allow to reuse previosuly allocated buffer which is big enough */ > > + int buffer_size; > > + /* keep buffer info accross opens */ > > + unsigned long buf_virt_addr[VIDEO_MAX_FRAME]; > > + unsigned long buf_phy_addr[VIDEO_MAX_FRAME]; > > + > > + /* we don't allow to request new buffer when old buffers are > > + * still mmaped > > + */ > > + int mmap_count; > > + > > + spinlock_t vbq_lock; /* spinlock for videobuf queues */ > > + unsigned long field_count; /* field counter for videobuf_buffer */ > > + > > + /* non-NULL means streaming is in progress. */ > > + struct omap_vout_fh *streaming; > > + > > + struct v4l2_pix_format pix; > > + struct v4l2_rect crop; > > + struct v4l2_window win; > > + struct v4l2_framebuffer fbuf; > > + > > + /* Lock to protect the shared data structures in ioctl */ > > + struct mutex lock; > > + > > + > > + /* V4L2 control structure for different control id */ > > + struct v4l2_control control[MAX_CID]; > > + int rotation; > > + int mirror; > > + int flicker_filter; > > + /* V4L2 control structure for different control id */ > > + > > + int bpp; /* bytes per pixel */ > > + int vrfb_bpp; /* bytes per pixel with respect to VRFB */ > > + > > + struct vid_vrfb_dma vrfb_dma_tx; > > + unsigned int smsshado_phy_addr[4]; > > + unsigned int smsshado_virt_addr[4]; > > + struct vrfb vrfb_context[4]; > > + unsigned int smsshado_size; > > + unsigned char pos; > > + > > + int ps, vr_ps, line_length, first_int, field_id; > > + enum v4l2_memory memory; > > + struct videobuf_buffer *cur_frm, *next_frm; > > + struct list_head dma_queue; > > + u8 *queued_buf_addr[32]; > > + u32 cropped_offset; > > + s32 tv_field1_offset; > > + void *isr_handle; > > + > > +}; > > + > > +/* per-filehandle data structure */ > > +struct omap_vout_fh { > > + struct omap_vout_device *vout; > > + enum v4l2_buf_type type; > > + struct videobuf_queue vbq; > > + int io_allowed; > > +}; > > + > > +#endif /* ifndef OMAP_VOUTDEF_H */ > > diff --git a/drivers/media/video/omap/omap_voutlib.c > b/drivers/media/video/omap/omap_voutlib.c > > new file mode 100644 > > index 0000000..46b02c3 > > --- /dev/null > > +++ b/drivers/media/video/omap/omap_voutlib.c > > @@ -0,0 +1,265 @@ > > +/* > > + * drivers/media/video/omap/omap_voutlib.c > > + * > > + * Copyright (C) 2005-2009 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. > > + * > > + * Based on the OMAP2 camera driver > > + * Video-for-Linux (Version 2) camera capture driver for > > + * the OMAP24xx camera controller. > > + * > > + * Author: Andy Lowe (source@xxxxxxxxxx) > > + * > > + * Copyright (C) 2004 MontaVista Software, Inc. > > + * Copyright (C) 2009 Texas Instruments. > > + * > > + */ > > + > > +#include <linux/init.h> > > +#include <linux/module.h> > > +#include <linux/delay.h> > > +#include <linux/errno.h> > > +#include <linux/kernel.h> > > +#include <linux/vmalloc.h> > > +#include <linux/slab.h> > > +#include <linux/sched.h> > > +#include <linux/smp_lock.h> > > +#include <linux/kdev_t.h> > > +#include <linux/types.h> > > +#include <linux/wait.h> > > +#include <linux/videodev2.h> > > +#include <linux/semaphore.h> > > + > > +/* Return the default overlay cropping rectangle in crop given the image > > + * size in pix and the video display size in fbuf. The default > > + * cropping rectangle is the largest rectangle no larger than the capture > size > > + * that will fit on the display. The default cropping rectangle is > centered in > > + * the image. All dimensions and offsets are rounded down to even numbers. > > + */ > > +void omap_vout_default_crop(struct v4l2_pix_format *pix, > > + struct v4l2_framebuffer *fbuf, struct v4l2_rect *crop) > > +{ > > + crop->width = (pix->width < fbuf->fmt.width) ? > > + pix->width : fbuf->fmt.width; > > + crop->height = (pix->height < fbuf->fmt.height) ? > > + pix->height : fbuf->fmt.height; > > + crop->width &= ~1; > > + crop->height &= ~1; > > + crop->left = ((pix->width - crop->width) >> 1) & ~1; > > + crop->top = ((pix->height - crop->height) >> 1) & ~1; > > +} > > +EXPORT_SYMBOL_GPL(omap_vout_default_crop); > > Add empty line between functions. [Shah, Hardik] Done. > > > +/* Given a new render window in new_win, adjust the window to the > > + * nearest supported configuration. The adjusted window parameters are > > + * returned in new_win. > > + * Returns zero if succesful, or -EINVAL if the requested window is > > + * impossible and cannot reasonably be adjusted. > > + */ > > +int omap_vout_try_window(struct v4l2_framebuffer *fbuf, > > + struct v4l2_window *new_win) > > +{ > > + struct v4l2_rect try_win; > > + > > + /* make a working copy of the new_win rectangle */ > > + try_win = new_win->w; > > + > > + /* adjust the preview window so it fits on the display by clipping any > > + * offscreen areas > > + */ > > + if (try_win.left < 0) { > > + try_win.width += try_win.left; > > + try_win.left = 0; > > + } > > + if (try_win.top < 0) { > > + try_win.height += try_win.top; > > + try_win.top = 0; > > + } > > + try_win.width = (try_win.width < fbuf->fmt.width) ? > > + try_win.width : fbuf->fmt.width; > > + try_win.height = (try_win.height < fbuf->fmt.height) ? > > + try_win.height : fbuf->fmt.height; > > + if (try_win.left + try_win.width > fbuf->fmt.width) > > + try_win.width = fbuf->fmt.width - try_win.left; > > + if (try_win.top + try_win.height > fbuf->fmt.height) > > + try_win.height = fbuf->fmt.height - try_win.top; > > + try_win.width &= ~1; > > + try_win.height &= ~1; > > + > > + if (try_win.width <= 0 || try_win.height <= 0) > > + return -EINVAL; > > + > > + /* We now have a valid preview window, so go with it */ > > + new_win->w = try_win; > > + new_win->field = /*V4L2_FIELD_NONE*/V4L2_FIELD_ANY; > > Left-over comment? [Shah, Hardik] Removed > > > + return 0; > > +} > > +EXPORT_SYMBOL_GPL(omap_vout_try_window); > > + > > +/* Given a new render window in new_win, adjust the window to the > > + * nearest supported configuration. The image cropping window in crop > > + * will also be adjusted if necessary. Preference is given to keeping the > > + * the window as close to the requested configuration as possible. If > > + * successful, new_win, vout->win, and crop are updated. > > + * Returns zero if succesful, or -EINVAL if the requested preview window is > > + * impossible and cannot reasonably be adjusted. > > + */ > > +int omap_vout_new_window(struct v4l2_rect *crop, > > + struct v4l2_window *win, struct v4l2_framebuffer *fbuf, > > + struct v4l2_window *new_win) > > +{ > > + int err; > > + > > + err = omap_vout_try_window(fbuf, new_win); > > + if (err) > > + return err; > > + > > + /* update our preview window */ > > + win->w = new_win->w; > > + win->field = new_win->field; > > + win->chromakey = new_win->chromakey; > > + > > + /* adjust the cropping window to allow for resizing limitations */ > > + if ((crop->height/win->w.height) >= 4) { > > + /* The maximum vertical downsizing ratio is 4:1 */ > > + crop->height = win->w.height * 4; > > + } > > + if ((crop->width/win->w.width) >= 4) { > > + /* The maximum horizontal downsizing ratio is 4:1 */ > > + crop->width = win->w.width * 4; > > + } > > + return 0; > > +} > > +EXPORT_SYMBOL_GPL(omap_vout_new_window); > > + > > +/* Given a new cropping rectangle in new_crop, adjust the cropping > rectangle to > > + * the nearest supported configuration. The image render window in win > will > > + * also be adjusted if necessary. The preview window is adjusted such that > the > > + * horizontal and vertical rescaling ratios stay constant. If the render > > + * window would fall outside the display boundaries, the cropping rectangle > > + * will also be adjusted to maintain the rescaling ratios. If successful, > crop > > + * and win are updated. > > + * Returns zero if succesful, or -EINVAL if the requested cropping > rectangle is > > + * impossible and cannot reasonably be adjusted. > > + */ > > +int omap_vout_new_crop(struct v4l2_pix_format *pix, > > + struct v4l2_rect *crop, struct v4l2_window *win, > > + struct v4l2_framebuffer *fbuf, const struct v4l2_rect *new_crop) > > +{ > > + struct v4l2_rect try_crop; > > + unsigned long vresize, hresize; > > + > > + /* make a working copy of the new_crop rectangle */ > > + try_crop = *new_crop; > > + > > + /* adjust the cropping rectangle so it fits in the image */ > > + if (try_crop.left < 0) { > > + try_crop.width += try_crop.left; > > + try_crop.left = 0; > > + } > > + if (try_crop.top < 0) { > > + try_crop.height += try_crop.top; > > + try_crop.top = 0; > > + } > > + try_crop.width = (try_crop.width < pix->width) ? > > + try_crop.width : pix->width; > > + try_crop.height = (try_crop.height < pix->height) ? > > + try_crop.height : pix->height; > > + if (try_crop.left + try_crop.width > pix->width) > > + try_crop.width = pix->width - try_crop.left; > > + if (try_crop.top + try_crop.height > pix->height) > > + try_crop.height = pix->height - try_crop.top; > > + try_crop.width &= ~1; > > + try_crop.height &= ~1; > > + if (try_crop.width <= 0 || try_crop.height <= 0) > > + return -EINVAL; > > + > > + if (crop->height != win->w.height) { > > + /* If we're resizing vertically, we can't support a crop width > > + * wider than 768 pixels. > > + */ > > + if (try_crop.width > 768) > > + try_crop.width = 768; > > + } > > + /* vertical resizing */ > > + vresize = (1024 * crop->height) / win->w.height; > > + if (vresize > 4096) > > + vresize = 4096; > > + else if (vresize == 0) > > + vresize = 1; > > + win->w.height = ((1024 * try_crop.height) / vresize) & ~1; > > + if (win->w.height == 0) > > + win->w.height = 2; > > + if (win->w.height + win->w.top > fbuf->fmt.height) { > > + /* We made the preview window extend below the bottom of the > > + * display, so clip it to the display boundary and resize the > > + * cropping height to maintain the vertical resizing ratio. > > + */ > > + win->w.height = (fbuf->fmt.height - win->w.top) & ~1; > > + if (try_crop.height == 0) > > + try_crop.height = 2; > > + } > > + /* horizontal resizing */ > > + hresize = (1024 * crop->width) / win->w.width; > > + if (hresize > 4096) > > + hresize = 4096; > > + else if (hresize == 0) > > + hresize = 1; > > + win->w.width = ((1024 * try_crop.width) / hresize) & ~1; > > + if (win->w.width == 0) > > + win->w.width = 2; > > + if (win->w.width + win->w.left > fbuf->fmt.width) { > > + /* We made the preview window extend past the right side of the > > + * display, so clip it to the display boundary and resize the > > + * cropping width to maintain the horizontal resizing ratio. > > + */ > > + win->w.width = (fbuf->fmt.width - win->w.left) & ~1; > > + if (try_crop.width == 0) > > + try_crop.width = 2; > > + } > > + > > + /* Check for resizing constraints */ > > + if ((try_crop.height/win->w.height) >= 4) { > > + /* The maximum vertical downsizing ratio is 4:1 */ > > + try_crop.height = win->w.height * 4; > > + } > > + if ((try_crop.width/win->w.width) >= 4) { > > + /* The maximum horizontal downsizing ratio is 4:1 */ > > + try_crop.width = win->w.width * 4; > > + } > > + > > + /* update our cropping rectangle and we're done */ > > + *crop = try_crop; > > + return 0; > > +} > > +EXPORT_SYMBOL_GPL(omap_vout_new_crop); > > + > > +/* Given a new format in pix and fbuf, crop and win > > + * structures are initialized to default values. crop > > + * is initialized to the largest window size that will fit on the display. > The > > + * crop window is centered in the image. win is initialized to > > + * the same size as crop and is centered on the display. > > + * All sizes and offsets are constrained to be even numbers. > > + */ > > +void omap_vout_new_format(struct v4l2_pix_format *pix, > > + struct v4l2_framebuffer *fbuf, struct v4l2_rect *crop, > > + struct v4l2_window *win) > > +{ > > + /* crop defines the preview source window in the image capture > > + * buffer > > + */ > > + omap_vout_default_crop(pix, fbuf, crop); > > + > > + /* win defines the preview target window on the display */ > > + win->w.width = crop->width; > > + win->w.height = crop->height; > > + win->w.left = ((fbuf->fmt.width - win->w.width) >> 1) & ~1; > > + win->w.top = ((fbuf->fmt.height - win->w.height) >> 1) & ~1; > > +} > > +EXPORT_SYMBOL_GPL(omap_vout_new_format); > > + > > +MODULE_AUTHOR("Texas Instruments."); > > +MODULE_DESCRIPTION("OMAP Video library"); > > +MODULE_LICENSE("GPL"); > > diff --git a/drivers/media/video/omap/omap_voutlib.h > b/drivers/media/video/omap/omap_voutlib.h > > new file mode 100644 > > index 0000000..8ef6e25 > > --- /dev/null > > +++ b/drivers/media/video/omap/omap_voutlib.h > > @@ -0,0 +1,34 @@ > > +/* > > + * drivers/media/video/omap/omap_voutlib.h > > + * > > + * Copyright (C) 2009 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. > > + * > > + */ > > + > > +#ifndef OMAP_VOUTLIB_H > > +#define OMAP_VOUTLIB_H > > + > > +extern void omap_vout_default_crop(struct v4l2_pix_format *pix, > > + struct v4l2_framebuffer *fbuf, struct v4l2_rect *crop); > > + > > +extern int omap_vout_new_crop(struct v4l2_pix_format *pix, > > + struct v4l2_rect *crop, struct v4l2_window *win, > > + struct v4l2_framebuffer *fbuf, > > + const struct v4l2_rect *new_crop); > > + > > +extern int omap_vout_try_window(struct v4l2_framebuffer *fbuf, > > + struct v4l2_window *new_win); > > + > > +extern int omap_vout_new_window(struct v4l2_rect *crop, > > + struct v4l2_window *win, struct v4l2_framebuffer *fbuf, > > + struct v4l2_window *new_win); > > + > > +extern void omap_vout_new_format(struct v4l2_pix_format *pix, > > + struct v4l2_framebuffer *fbuf, struct v4l2_rect *crop, > > + struct v4l2_window *win); > > +#endif /* #ifndef OMAP_LIB_H */ > > + > > -- > > 1.6.0.3 > > > > -- > > To unsubscribe from this list: send the line "unsubscribe linux-media" in > > the body of a message to majordomo@xxxxxxxxxxxxxxx > > More majordomo info at http://vger.kernel.org/majordomo-info.html > > > > > > Regards, > > Hans > > -- > Hans Verkuil - video4linux developer - sponsored by TANDBERG -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
