diff options
author | Ricardo Perez Olivares <x0081762@ti.com> | 2010-08-13 16:31:01 -0500 |
---|---|---|
committer | Ricardo Perez Olivares <x0081762@ti.com> | 2010-08-13 16:31:01 -0500 |
commit | 2b34e24be2a57f1b53898f7e860be9ccec996004 (patch) | |
tree | 02827681699de560bf11b7a4f4be6ea32db2f6cc /drivers | |
parent | 4ff1b8dea474fe2d442c779bfb0cbf48e547dc44 (diff) | |
parent | b051edb8032b0641d1e63304fdafb634540439b6 (diff) |
Merge branch 'display-next' of git://dev.omapzoom.org/pub/scm/axelcx/kernel-display into L24x9
Conflicts:
arch/arm/configs/omap_4430sdp_defconfig
arch/arm/mach-omap2/board-4430sdp.c
arch/arm/mach-omap2/board-omap4panda.c
arch/arm/mach-omap2/devices.c
arch/arm/plat-omap/hdmi_lib.c
drivers/Kconfig
drivers/Makefile
drivers/media/video/omap/omap_vout.c
drivers/media/video/omap/omap_wb.c
drivers/video/omap2/dss/dss.c
drivers/video/omap2/omapfb/omapfb-main.c
Signed-off-by: Ricardo Perez Olivares <x0081762@ti.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/media/video/omap/omap_vout.c | 4 | ||||
-rw-r--r-- | drivers/media/video/omap/omap_wb.c | 11 | ||||
-rw-r--r-- | drivers/video/omap2/dss/dss.c | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | drivers/video/omap2/omapfb/omapfb-main.c | 8 |
4 files changed, 14 insertions, 11 deletions
diff --git a/drivers/media/video/omap/omap_vout.c b/drivers/media/video/omap/omap_vout.c index da017ffb0754..d288e3841230 100644 --- a/drivers/media/video/omap/omap_vout.c +++ b/drivers/media/video/omap/omap_vout.c @@ -804,7 +804,7 @@ enum omap_color_mode video_mode_to_dss_mode(struct v4l2_pix_format *pix) ovid = &vout->vid_info; ovl = ovid->overlays[0]; #else - enum omap_color_mode mode; + enum omap_color_mode mode = 1 << 0; #endif switch (pix->pixelformat) { case V4L2_PIX_FMT_NV12: @@ -1049,7 +1049,7 @@ void omap_vout_isr(void *arg, unsigned int irqstatus) struct omapvideo_info *ovid; struct omap_dss_device *cur_display; struct omap_vout_device *vout = (struct omap_vout_device *)arg; - u32 flags; + unsigned long flags; int irq = 0; if (!vout->streaming) diff --git a/drivers/media/video/omap/omap_wb.c b/drivers/media/video/omap/omap_wb.c index 2847255a224c..820408d1d61f 100644 --- a/drivers/media/video/omap/omap_wb.c +++ b/drivers/media/video/omap/omap_wb.c @@ -73,7 +73,7 @@ enum omap_color_mode video_mode_to_dss_mode( struct v4l2_pix_format *pix); void omap_wb_isr(void *arg, unsigned int irqstatus); int omap_dss_wb_apply(struct omap_overlay_manager *mgr, struct omap_writeback *wb); -int omap_dss_wb_flush(); +int omap_dss_wb_flush(void); int omap_setup_wb(struct omap_wb_device *wb_device, u32 addr, u32 uv_addr) { @@ -468,7 +468,7 @@ static int vidioc_streamoff(struct file *file, void *fh, return 0; } -static int vidioc_default_wb(struct file *file, void *fh, +static long vidioc_default(struct file *file, void *fh, int cmd, void *arg) { struct v4l2_writeback_ioctl_data *wb_data = NULL; @@ -538,7 +538,7 @@ static const struct v4l2_ioctl_ops wb_ioctl_fops = { .vidioc_streamoff = vidioc_streamoff, .vidioc_s_fmt_vid_overlay = vidioc_s_fmt_vid_overlay, .vidioc_g_fmt_vid_overlay = vidioc_g_fmt_vid_overlay, - .vidioc_default = vidioc_default_wb, + .vidioc_default = vidioc_default, }; static void omap_wb_tiler_buffer_free(struct omap_wb_device *wb, @@ -836,7 +836,7 @@ static int omap_wb_mmap(struct file *file, struct vm_area_struct *vma) /* UV Buffer in case of NV12 format */ if (OMAP_DSS_COLOR_NV12 == wb->dss_mode) { - pos = wb->buf_phy_uv_addr[i]; + pos = (void*) wb->buf_phy_uv_addr[i]; /* UV buffer is 2 bpp, but half size, so p remains */ m_increment = 2*64*TILER_WIDTH; @@ -1156,7 +1156,8 @@ void omap_wb_isr(void *arg, unsigned int irqstatus) int r = 0; struct omap_wb_device *wb = (struct omap_wb_device *) arg; - u32 addr, uv_addr, flags; + u32 addr, uv_addr; + unsigned long flags; spin_lock_irqsave(&wb->vbq_lock, flags); diff --git a/drivers/video/omap2/dss/dss.c b/drivers/video/omap2/dss/dss.c index 6387c04b299b..c6144fd5671a 100644 --- a/drivers/video/omap2/dss/dss.c +++ b/drivers/video/omap2/dss/dss.c @@ -129,6 +129,8 @@ void dss_restore_context(void) #undef SR #undef RR +static int use_count; + void dss_clk_enable() { use_count++; diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c index ce9aef7f5654..fcb417a45d7b 100644..100755 --- a/drivers/video/omap2/omapfb/omapfb-main.c +++ b/drivers/video/omap2/omapfb/omapfb-main.c @@ -980,7 +980,7 @@ err: /* apply var to the overlay */ int omapfb_apply_changes(struct fb_info *fbi, int init) { - int r = 0; + int r = 0, rotation = 0; struct omapfb_info *ofbi = FB2OFB(fbi); struct fb_var_screeninfo *var = &fbi->var; struct omap_overlay *ovl; @@ -1476,7 +1476,7 @@ static int omapfb_alloc_fbmem(struct fb_info *fbi, unsigned long size, struct omapfb_info *ofbi = FB2OFB(fbi); struct omapfb2_device *fbdev = ofbi->fbdev; struct omapfb2_mem_region *rg; - void __iomem *vaddr; + void __iomem *vaddr = NULL; int r; u16 h = 0, w = 0; unsigned long pstride; @@ -1502,7 +1502,7 @@ static int omapfb_alloc_fbmem(struct fb_info *fbi, unsigned long size, w = fbi->fix.line_length / (fbi->var.bits_per_pixel >> 3); h = size / fbi->fix.line_length; - err = tiler_alloc(TILFMT_32BIT, w, h, &paddr); + err = tiler_alloc(TILFMT_32BIT, w, h, (u32 *)&paddr); if (err != 0x0) return -ENOMEM; r = 0; @@ -1529,7 +1529,7 @@ static int omapfb_alloc_fbmem(struct fb_info *fbi, unsigned long size, return -ENOMEM; } } else if (ofbi->rotation_type == OMAP_DSS_ROT_TILER) { - pstride = tiler_stride(tiler_get_natural_addr(paddr)); + pstride = tiler_stride(tiler_get_natural_addr((void *)&paddr)); psize = h * pstride; vaddr = __arm_multi_strided_ioremap(1, &paddr, &psize, &pstride, (unsigned long *) &fbi->fix.line_length, |