OMAP: DSS2: omapfb driver
authorTomi Valkeinen <tomi.valkeinen@nokia.com>
Tue, 4 Aug 2009 13:12:50 +0000 (16:12 +0300)
committerTomi Valkeinen <tomi.valkeinen@nokia.com>
Wed, 9 Dec 2009 10:12:44 +0000 (12:12 +0200)
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
arch/arm/plat-omap/fb.c
drivers/video/omap/Kconfig
drivers/video/omap2/Kconfig
drivers/video/omap2/Makefile
drivers/video/omap2/omapfb/Kconfig [new file with mode: 0644]
drivers/video/omap2/omapfb/Makefile [new file with mode: 0644]
drivers/video/omap2/omapfb/omapfb-ioctl.c [new file with mode: 0644]
drivers/video/omap2/omapfb/omapfb-main.c [new file with mode: 0644]
drivers/video/omap2/omapfb/omapfb-sysfs.c [new file with mode: 0644]
drivers/video/omap2/omapfb/omapfb.h [new file with mode: 0644]
include/linux/omapfb.h

index 18cf1d4b7931895a1b9237b5558ab83c8be802e7..d3eea4f47533050618ce2a0e489a79f5f2725088 100644 (file)
@@ -55,6 +55,10 @@ static struct platform_device omap_fb_device = {
        .num_resources = 0,
 };
 
+void omapfb_set_platform_data(struct omapfb_platform_data *data)
+{
+}
+
 static inline int ranges_overlap(unsigned long start1, unsigned long size1,
                                 unsigned long start2, unsigned long size2)
 {
@@ -327,7 +331,33 @@ static inline int omap_init_fb(void)
 
 arch_initcall(omap_init_fb);
 
-#else
+#elif defined(CONFIG_FB_OMAP2) || defined(CONFIG_FB_OMAP2_MODULE)
+
+static u64 omap_fb_dma_mask = ~(u32)0;
+static struct omapfb_platform_data omapfb_config;
+
+static struct platform_device omap_fb_device = {
+       .name           = "omapfb",
+       .id             = -1,
+       .dev = {
+               .dma_mask               = &omap_fb_dma_mask,
+               .coherent_dma_mask      = ~(u32)0,
+               .platform_data          = &omapfb_config,
+       },
+       .num_resources = 0,
+};
+
+void omapfb_set_platform_data(struct omapfb_platform_data *data)
+{
+       omapfb_config = *data;
+}
+
+static inline int omap_init_fb(void)
+{
+       return platform_device_register(&omap_fb_device);
+}
+
+arch_initcall(omap_init_fb);
 
 void omapfb_reserve_sdram(void) {}
 unsigned long omapfb_reserve_sram(unsigned long sram_pstart,
@@ -339,5 +369,20 @@ unsigned long omapfb_reserve_sram(unsigned long sram_pstart,
        return 0;
 }
 
+#else
+
+void omapfb_set_platform_data(struct omapfb_platform_data *data)
+{
+}
+
+void omapfb_reserve_sdram(void) {}
+unsigned long omapfb_reserve_sram(unsigned long sram_pstart,
+                                 unsigned long sram_vstart,
+                                 unsigned long sram_size,
+                                 unsigned long start_avail,
+                                 unsigned long size_avail)
+{
+       return 0;
+}
 
 #endif
index 551e3e9c4cbee0e3b43a246f0997b9787bf511a7..455c6055325dcae647858eb6cede512388f033dc 100644 (file)
@@ -1,6 +1,7 @@
 config FB_OMAP
        tristate "OMAP frame buffer support (EXPERIMENTAL)"
-       depends on FB && ARCH_OMAP
+       depends on FB && ARCH_OMAP && (OMAP2_DSS = "n")
+
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
@@ -72,7 +73,7 @@ config FB_OMAP_LCD_MIPID
 
 config FB_OMAP_BOOTLOADER_INIT
        bool "Check bootloader initialization"
-       depends on FB_OMAP
+       depends on FB_OMAP || FB_OMAP2
        help
          Say Y here if you want to enable checking if the bootloader has
          already initialized the display controller. In this case the
index 55b4c4265f5794a1116e3d1de38ffbdfbd1b92ab..3e60d7e8854012064170d7cda4794627667558eb 100644 (file)
@@ -5,3 +5,4 @@ config OMAP2_VRFB
        bool
 
 source "drivers/video/omap2/dss/Kconfig"
+source "drivers/video/omap2/omapfb/Kconfig"
index ee0644f9d3c1eae5b6791c5df9a8632b12ea735c..3ba6ef5e30d430552da1ca3194ca39c35c489a30 100644 (file)
@@ -2,3 +2,4 @@ obj-$(CONFIG_OMAP2_VRAM) += vram.o
 obj-$(CONFIG_OMAP2_VRFB) += vrfb.o
 
 obj-y += dss/
+obj-y += omapfb/
diff --git a/drivers/video/omap2/omapfb/Kconfig b/drivers/video/omap2/omapfb/Kconfig
new file mode 100644 (file)
index 0000000..bb694cc
--- /dev/null
@@ -0,0 +1,37 @@
+menuconfig FB_OMAP2
+        tristate "OMAP2/3 frame buffer support (EXPERIMENTAL)"
+        depends on FB && OMAP2_DSS
+
+       select OMAP2_VRAM
+       select OMAP2_VRFB
+        select FB_CFB_FILLRECT
+        select FB_CFB_COPYAREA
+        select FB_CFB_IMAGEBLIT
+        help
+          Frame buffer driver for OMAP2/3 based boards.
+
+config FB_OMAP2_DEBUG_SUPPORT
+       bool "Debug support for OMAP2/3 FB"
+       default y
+       depends on FB_OMAP2
+       help
+         Support for debug output. You have to enable the actual printing
+         with debug module parameter.
+
+config FB_OMAP2_FORCE_AUTO_UPDATE
+       bool "Force main display to automatic update mode"
+       depends on FB_OMAP2
+       help
+         Forces main display to automatic update mode (if possible),
+         and also enables tearsync (if possible). By default
+         displays that support manual update are started in manual
+         update mode.
+
+config FB_OMAP2_NUM_FBS
+       int "Number of framebuffers"
+       range 1 10
+       default 3
+       depends on FB_OMAP2
+       help
+         Select the number of framebuffers created. OMAP2/3 has 3 overlays
+         so normally this would be 3.
diff --git a/drivers/video/omap2/omapfb/Makefile b/drivers/video/omap2/omapfb/Makefile
new file mode 100644 (file)
index 0000000..51c2e00
--- /dev/null
@@ -0,0 +1,2 @@
+obj-$(CONFIG_FB_OMAP2) += omapfb.o
+omapfb-y := omapfb-main.o omapfb-sysfs.o omapfb-ioctl.o
diff --git a/drivers/video/omap2/omapfb/omapfb-ioctl.c b/drivers/video/omap2/omapfb/omapfb-ioctl.c
new file mode 100644 (file)
index 0000000..4c4bafd
--- /dev/null
@@ -0,0 +1,755 @@
+/*
+ * linux/drivers/video/omap2/omapfb-ioctl.c
+ *
+ * Copyright (C) 2008 Nokia Corporation
+ * Author: Tomi Valkeinen <tomi.valkeinen@nokia.com>
+ *
+ * Some code and ideas taken from drivers/video/omap/ driver
+ * by Imre Deak.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <linux/fb.h>
+#include <linux/device.h>
+#include <linux/uaccess.h>
+#include <linux/platform_device.h>
+#include <linux/mm.h>
+#include <linux/omapfb.h>
+#include <linux/vmalloc.h>
+
+#include <plat/display.h>
+#include <plat/vrfb.h>
+#include <plat/vram.h>
+
+#include "omapfb.h"
+
+static int omapfb_setup_plane(struct fb_info *fbi, struct omapfb_plane_info *pi)
+{
+       struct omapfb_info *ofbi = FB2OFB(fbi);
+       struct omapfb2_device *fbdev = ofbi->fbdev;
+       struct omap_overlay *ovl;
+       struct omap_overlay_info info;
+       int r = 0;
+
+       DBG("omapfb_setup_plane\n");
+
+       if (ofbi->num_overlays != 1) {
+               r = -EINVAL;
+               goto out;
+       }
+
+       /* XXX uses only the first overlay */
+       ovl = ofbi->overlays[0];
+
+       if (pi->enabled && !ofbi->region.size) {
+               /*
+                * This plane's memory was freed, can't enable it
+                * until it's reallocated.
+                */
+               r = -EINVAL;
+               goto out;
+       }
+
+       ovl->get_overlay_info(ovl, &info);
+
+       info.pos_x = pi->pos_x;
+       info.pos_y = pi->pos_y;
+       info.out_width = pi->out_width;
+       info.out_height = pi->out_height;
+       info.enabled = pi->enabled;
+
+       r = ovl->set_overlay_info(ovl, &info);
+       if (r)
+               goto out;
+
+       if (ovl->manager) {
+               r = ovl->manager->apply(ovl->manager);
+               if (r)
+                       goto out;
+       }
+
+out:
+       if (r)
+               dev_err(fbdev->dev, "setup_plane failed\n");
+       return r;
+}
+
+static int omapfb_query_plane(struct fb_info *fbi, struct omapfb_plane_info *pi)
+{
+       struct omapfb_info *ofbi = FB2OFB(fbi);
+
+       if (ofbi->num_overlays != 1) {
+               memset(pi, 0, sizeof(*pi));
+       } else {
+               struct omap_overlay_info *ovli;
+               struct omap_overlay *ovl;
+
+               ovl = ofbi->overlays[0];
+               ovli = &ovl->info;
+
+               pi->pos_x = ovli->pos_x;
+               pi->pos_y = ovli->pos_y;
+               pi->enabled = ovli->enabled;
+               pi->channel_out = 0; /* xxx */
+               pi->mirror = 0;
+               pi->out_width = ovli->out_width;
+               pi->out_height = ovli->out_height;
+       }
+
+       return 0;
+}
+
+static int omapfb_setup_mem(struct fb_info *fbi, struct omapfb_mem_info *mi)
+{
+       struct omapfb_info *ofbi = FB2OFB(fbi);
+       struct omapfb2_device *fbdev = ofbi->fbdev;
+       struct omapfb2_mem_region *rg;
+       int r, i;
+       size_t size;
+
+       if (mi->type > OMAPFB_MEMTYPE_MAX)
+               return -EINVAL;
+
+       size = PAGE_ALIGN(mi->size);
+
+       rg = &ofbi->region;
+
+       for (i = 0; i < ofbi->num_overlays; i++) {
+               if (ofbi->overlays[i]->info.enabled)
+                       return -EBUSY;
+       }
+
+       if (rg->size != size || rg->type != mi->type) {
+               r = omapfb_realloc_fbmem(fbi, size, mi->type);
+               if (r) {
+                       dev_err(fbdev->dev, "realloc fbmem failed\n");
+                       return r;
+               }
+       }
+
+       return 0;
+}
+
+static int omapfb_query_mem(struct fb_info *fbi, struct omapfb_mem_info *mi)
+{
+       struct omapfb_info *ofbi = FB2OFB(fbi);
+       struct omapfb2_mem_region *rg;
+
+       rg = &ofbi->region;
+       memset(mi, 0, sizeof(*mi));
+
+       mi->size = rg->size;
+       mi->type = rg->type;
+
+       return 0;
+}
+
+static int omapfb_update_window_nolock(struct fb_info *fbi,
+               u32 x, u32 y, u32 w, u32 h)
+{
+       struct omap_dss_device *display = fb2display(fbi);
+       u16 dw, dh;
+
+       if (!display)
+               return 0;
+
+       if (w == 0 || h == 0)
+               return 0;
+
+       display->get_resolution(display, &dw, &dh);
+
+       if (x + w > dw || y + h > dh)
+               return -EINVAL;
+
+       return display->update(display, x, y, w, h);
+}
+
+/* This function is exported for SGX driver use */
+int omapfb_update_window(struct fb_info *fbi,
+               u32 x, u32 y, u32 w, u32 h)
+{
+       struct omapfb_info *ofbi = FB2OFB(fbi);
+       struct omapfb2_device *fbdev = ofbi->fbdev;
+       int r;
+
+       omapfb_lock(fbdev);
+       lock_fb_info(fbi);
+
+       r = omapfb_update_window_nolock(fbi, x, y, w, h);
+
+       unlock_fb_info(fbi);
+       omapfb_unlock(fbdev);
+
+       return r;
+}
+EXPORT_SYMBOL(omapfb_update_window);
+
+static int omapfb_set_update_mode(struct fb_info *fbi,
+                                  enum omapfb_update_mode mode)
+{
+       struct omap_dss_device *display = fb2display(fbi);
+       enum omap_dss_update_mode um;
+       int r;
+
+       if (!display || !display->set_update_mode)
+               return -EINVAL;
+
+       switch (mode) {
+       case OMAPFB_UPDATE_DISABLED:
+               um = OMAP_DSS_UPDATE_DISABLED;
+               break;
+
+       case OMAPFB_AUTO_UPDATE:
+               um = OMAP_DSS_UPDATE_AUTO;
+               break;
+
+       case OMAPFB_MANUAL_UPDATE:
+               um = OMAP_DSS_UPDATE_MANUAL;
+               break;
+
+       default:
+               return -EINVAL;
+       }
+
+       r = display->set_update_mode(display, um);
+
+       return r;
+}
+
+static int omapfb_get_update_mode(struct fb_info *fbi,
+               enum omapfb_update_mode *mode)
+{
+       struct omap_dss_device *display = fb2display(fbi);
+       enum omap_dss_update_mode m;
+
+       if (!display || !display->get_update_mode)
+               return -EINVAL;
+
+       m = display->get_update_mode(display);
+
+       switch (m) {
+       case OMAP_DSS_UPDATE_DISABLED:
+               *mode = OMAPFB_UPDATE_DISABLED;
+               break;
+       case OMAP_DSS_UPDATE_AUTO:
+               *mode = OMAPFB_AUTO_UPDATE;
+               break;
+       case OMAP_DSS_UPDATE_MANUAL:
+               *mode = OMAPFB_MANUAL_UPDATE;
+               break;
+       default:
+               BUG();
+       }
+
+       return 0;
+}
+
+/* XXX this color key handling is a hack... */
+static struct omapfb_color_key omapfb_color_keys[2];
+
+static int _omapfb_set_color_key(struct omap_overlay_manager *mgr,
+               struct omapfb_color_key *ck)
+{
+       struct omap_overlay_manager_info info;
+       enum omap_dss_trans_key_type kt;
+       int r;
+
+       mgr->get_manager_info(mgr, &info);
+
+       if (ck->key_type == OMAPFB_COLOR_KEY_DISABLED) {
+               info.trans_enabled = false;
+               omapfb_color_keys[mgr->id] = *ck;
+
+               r = mgr->set_manager_info(mgr, &info);
+               if (r)
+                       return r;
+
+               r = mgr->apply(mgr);
+
+               return r;
+       }
+
+       switch (ck->key_type) {
+       case OMAPFB_COLOR_KEY_GFX_DST:
+               kt = OMAP_DSS_COLOR_KEY_GFX_DST;
+               break;
+       case OMAPFB_COLOR_KEY_VID_SRC:
+               kt = OMAP_DSS_COLOR_KEY_VID_SRC;
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       info.default_color = ck->background;
+       info.trans_key = ck->trans_key;
+       info.trans_key_type = kt;
+       info.trans_enabled = true;
+
+       omapfb_color_keys[mgr->id] = *ck;
+
+       r = mgr->set_manager_info(mgr, &info);
+       if (r)
+               return r;
+
+       r = mgr->apply(mgr);
+
+       return r;
+}
+
+static int omapfb_set_color_key(struct fb_info *fbi,
+               struct omapfb_color_key *ck)
+{
+       struct omapfb_info *ofbi = FB2OFB(fbi);
+       struct omapfb2_device *fbdev = ofbi->fbdev;
+       int r;
+       int i;
+       struct omap_overlay_manager *mgr = NULL;
+
+       omapfb_lock(fbdev);
+
+       for (i = 0; i < ofbi->num_overlays; i++) {
+               if (ofbi->overlays[i]->manager) {
+                       mgr = ofbi->overlays[i]->manager;
+                       break;
+               }
+       }
+
+       if (!mgr) {
+               r = -EINVAL;
+               goto err;
+       }
+
+       r = _omapfb_set_color_key(mgr, ck);
+err:
+       omapfb_unlock(fbdev);
+
+       return r;
+}
+
+static int omapfb_get_color_key(struct fb_info *fbi,
+               struct omapfb_color_key *ck)
+{
+       struct omapfb_info *ofbi = FB2OFB(fbi);
+       struct omapfb2_device *fbdev = ofbi->fbdev;
+       struct omap_overlay_manager *mgr = NULL;
+       int r = 0;
+       int i;
+
+       omapfb_lock(fbdev);
+
+       for (i = 0; i < ofbi->num_overlays; i++) {
+               if (ofbi->overlays[i]->manager) {
+                       mgr = ofbi->overlays[i]->manager;
+                       break;
+               }
+       }
+
+       if (!mgr) {
+               r = -EINVAL;
+               goto err;
+       }
+
+       *ck = omapfb_color_keys[mgr->id];
+err:
+       omapfb_unlock(fbdev);
+
+       return r;
+}
+
+static int omapfb_memory_read(struct fb_info *fbi,
+               struct omapfb_memory_read *mr)
+{
+       struct omap_dss_device *display = fb2display(fbi);
+       void *buf;
+       int r;
+
+       if (!display || !display->memory_read)
+               return -ENOENT;
+
+       if (!access_ok(VERIFY_WRITE, mr->buffer, mr->buffer_size))
+               return -EFAULT;
+
+       if (mr->w * mr->h * 3 > mr->buffer_size)
+               return -EINVAL;
+
+       buf = vmalloc(mr->buffer_size);
+       if (!buf) {
+               DBG("vmalloc failed\n");
+               return -ENOMEM;
+       }
+
+       r = display->memory_read(display, buf, mr->buffer_size,
+                       mr->x, mr->y, mr->w, mr->h);
+
+       if (r > 0) {
+               if (copy_to_user(mr->buffer, buf, mr->buffer_size))
+                       r = -EFAULT;
+       }
+
+       vfree(buf);
+
+       return r;
+}
+
+static int omapfb_get_ovl_colormode(struct omapfb2_device *fbdev,
+                            struct omapfb_ovl_colormode *mode)
+{
+       int ovl_idx = mode->overlay_idx;
+       int mode_idx = mode->mode_idx;
+       struct omap_overlay *ovl;
+       enum omap_color_mode supported_modes;
+       struct fb_var_screeninfo var;
+       int i;
+
+       if (ovl_idx >= fbdev->num_overlays)
+               return -ENODEV;
+       ovl = fbdev->overlays[ovl_idx];
+       supported_modes = ovl->supported_modes;
+
+       mode_idx = mode->mode_idx;
+
+       for (i = 0; i < sizeof(supported_modes) * 8; i++) {
+               if (!(supported_modes & (1 << i)))
+                       continue;
+               /*
+                * It's possible that the FB doesn't support a mode
+                * that is supported by the overlay, so call the
+                * following here.
+                */
+               if (dss_mode_to_fb_mode(1 << i, &var) < 0)
+                       continue;
+
+               mode_idx--;
+               if (mode_idx < 0)
+                       break;
+       }
+
+       if (i == sizeof(supported_modes) * 8)
+               return -ENOENT;
+
+       mode->bits_per_pixel = var.bits_per_pixel;
+       mode->nonstd = var.nonstd;
+       mode->red = var.red;
+       mode->green = var.green;
+       mode->blue = var.blue;
+       mode->transp = var.transp;
+
+       return 0;
+}
+
+static int omapfb_wait_for_go(struct fb_info *fbi)
+{
+       struct omapfb_info *ofbi = FB2OFB(fbi);
+       int r = 0;
+       int i;
+
+       for (i = 0; i < ofbi->num_overlays; ++i) {
+               struct omap_overlay *ovl = ofbi->overlays[i];
+               r = ovl->wait_for_go(ovl);
+               if (r)
+                       break;
+       }
+
+       return r;
+}
+
+int omapfb_ioctl(struct fb_info *fbi, unsigned int cmd, unsigned long arg)
+{
+       struct omapfb_info *ofbi = FB2OFB(fbi);
+       struct omapfb2_device *fbdev = ofbi->fbdev;
+       struct omap_dss_device *display = fb2display(fbi);
+
+       union {
+               struct omapfb_update_window_old uwnd_o;
+               struct omapfb_update_window     uwnd;
+               struct omapfb_plane_info        plane_info;
+               struct omapfb_caps              caps;
+               struct omapfb_mem_info          mem_info;
+               struct omapfb_color_key         color_key;
+               struct omapfb_ovl_colormode     ovl_colormode;
+               enum omapfb_update_mode         update_mode;
+               int test_num;
+               struct omapfb_memory_read       memory_read;
+               struct omapfb_vram_info         vram_info;
+               struct omapfb_tearsync_info     tearsync_info;
+       } p;
+
+       int r = 0;
+
+       switch (cmd) {
+       case OMAPFB_SYNC_GFX:
+               DBG("ioctl SYNC_GFX\n");
+               if (!display || !display->sync) {
+                       /* DSS1 never returns an error here, so we neither */
+                       /*r = -EINVAL;*/
+                       break;
+               }
+
+               r = display->sync(display);
+               break;
+
+       case OMAPFB_UPDATE_WINDOW_OLD:
+               DBG("ioctl UPDATE_WINDOW_OLD\n");
+               if (!display || !display->update) {
+                       r = -EINVAL;
+                       break;
+               }
+
+               if (copy_from_user(&p.uwnd_o,
+                                       (void __user *)arg,
+                                       sizeof(p.uwnd_o))) {
+                       r = -EFAULT;
+                       break;
+               }
+
+               r = omapfb_update_window_nolock(fbi, p.uwnd_o.x, p.uwnd_o.y,
+                               p.uwnd_o.width, p.uwnd_o.height);
+               break;
+
+       case OMAPFB_UPDATE_WINDOW:
+               DBG("ioctl UPDATE_WINDOW\n");
+               if (!display || !display->update) {
+                       r = -EINVAL;
+                       break;
+               }
+
+               if (copy_from_user(&p.uwnd, (void __user *)arg,
+                                       sizeof(p.uwnd))) {
+                       r = -EFAULT;
+                       break;
+               }
+
+               r = omapfb_update_window_nolock(fbi, p.uwnd.x, p.uwnd.y,
+                               p.uwnd.width, p.uwnd.height);
+               break;
+
+       case OMAPFB_SETUP_PLANE:
+               DBG("ioctl SETUP_PLANE\n");
+               if (copy_from_user(&p.plane_info, (void __user *)arg,
+                                       sizeof(p.plane_info)))
+                       r = -EFAULT;
+               else
+                       r = omapfb_setup_plane(fbi, &p.plane_info);
+               break;
+
+       case OMAPFB_QUERY_PLANE:
+               DBG("ioctl QUERY_PLANE\n");
+               r = omapfb_query_plane(fbi, &p.plane_info);
+               if (r < 0)
+                       break;
+               if (copy_to_user((void __user *)arg, &p.plane_info,
+                                       sizeof(p.plane_info)))
+                       r = -EFAULT;
+               break;
+
+       case OMAPFB_SETUP_MEM:
+               DBG("ioctl SETUP_MEM\n");
+               if (copy_from_user(&p.mem_info, (void __user *)arg,
+                                       sizeof(p.mem_info)))
+                       r = -EFAULT;
+               else
+                       r = omapfb_setup_mem(fbi, &p.mem_info);
+               break;
+
+       case OMAPFB_QUERY_MEM:
+               DBG("ioctl QUERY_MEM\n");
+               r = omapfb_query_mem(fbi, &p.mem_info);
+               if (r < 0)
+                       break;
+               if (copy_to_user((void __user *)arg, &p.mem_info,
+                                       sizeof(p.mem_info)))
+                       r = -EFAULT;
+               break;
+
+       case OMAPFB_GET_CAPS:
+               DBG("ioctl GET_CAPS\n");
+               if (!display) {
+                       r = -EINVAL;
+                       break;
+               }
+
+               memset(&p.caps, 0, sizeof(p.caps));
+               if (display->caps & OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE)
+                       p.caps.ctrl |= OMAPFB_CAPS_MANUAL_UPDATE;
+               if (display->caps & OMAP_DSS_DISPLAY_CAP_TEAR_ELIM)
+                       p.caps.ctrl |= OMAPFB_CAPS_TEARSYNC;
+
+               if (copy_to_user((void __user *)arg, &p.caps, sizeof(p.caps)))
+                       r = -EFAULT;
+               break;
+
+       case OMAPFB_GET_OVERLAY_COLORMODE:
+               DBG("ioctl GET_OVERLAY_COLORMODE\n");
+               if (copy_from_user(&p.ovl_colormode, (void __user *)arg,
+                                  sizeof(p.ovl_colormode))) {
+                       r = -EFAULT;
+                       break;
+               }
+               r = omapfb_get_ovl_colormode(fbdev, &p.ovl_colormode);
+               if (r < 0)
+                       break;
+               if (copy_to_user((void __user *)arg, &p.ovl_colormode,
+                                sizeof(p.ovl_colormode)))
+                       r = -EFAULT;
+               break;
+
+       case OMAPFB_SET_UPDATE_MODE:
+               DBG("ioctl SET_UPDATE_MODE\n");
+               if (get_user(p.update_mode, (int __user *)arg))
+                       r = -EFAULT;
+               else
+                       r = omapfb_set_update_mode(fbi, p.update_mode);
+               break;
+
+       case OMAPFB_GET_UPDATE_MODE:
+               DBG("ioctl GET_UPDATE_MODE\n");
+               r = omapfb_get_update_mode(fbi, &p.update_mode);
+               if (r)
+                       break;
+               if (put_user(p.update_mode,
+                                       (enum omapfb_update_mode __user *)arg))
+                       r = -EFAULT;
+               break;
+
+       case OMAPFB_SET_COLOR_KEY:
+               DBG("ioctl SET_COLOR_KEY\n");
+               if (copy_from_user(&p.color_key, (void __user *)arg,
+                                  sizeof(p.color_key)))
+                       r = -EFAULT;
+               else
+                       r = omapfb_set_color_key(fbi, &p.color_key);
+               break;
+
+       case OMAPFB_GET_COLOR_KEY:
+               DBG("ioctl GET_COLOR_KEY\n");
+               r = omapfb_get_color_key(fbi, &p.color_key);
+               if (r)
+                       break;
+               if (copy_to_user((void __user *)arg, &p.color_key,
+                                sizeof(p.color_key)))
+                       r = -EFAULT;
+               break;
+
+       case OMAPFB_WAITFORVSYNC:
+               DBG("ioctl WAITFORVSYNC\n");
+               if (!display) {
+                       r = -EINVAL;
+                       break;
+               }
+
+               r = display->wait_vsync(display);
+               break;
+
+       case OMAPFB_WAITFORGO:
+               DBG("ioctl WAITFORGO\n");
+               if (!display) {
+                       r = -EINVAL;
+                       break;
+               }
+
+               r = omapfb_wait_for_go(fbi);
+               break;
+
+       /* LCD and CTRL tests do the same thing for backward
+        * compatibility */
+       case OMAPFB_LCD_TEST:
+               DBG("ioctl LCD_TEST\n");
+               if (get_user(p.test_num, (int __user *)arg)) {
+                       r = -EFAULT;
+                       break;
+               }
+               if (!display || !display->run_test) {
+                       r = -EINVAL;
+                       break;
+               }
+
+               r = display->run_test(display, p.test_num);
+
+               break;
+
+       case OMAPFB_CTRL_TEST:
+               DBG("ioctl CTRL_TEST\n");
+               if (get_user(p.test_num, (int __user *)arg)) {
+                       r = -EFAULT;
+                       break;
+               }
+               if (!display || !display->run_test) {
+                       r = -EINVAL;
+                       break;
+               }
+
+               r = display->run_test(display, p.test_num);
+
+               break;
+
+       case OMAPFB_MEMORY_READ:
+               DBG("ioctl MEMORY_READ\n");
+
+               if (copy_from_user(&p.memory_read, (void __user *)arg,
+                                       sizeof(p.memory_read))) {
+                       r = -EFAULT;
+                       break;
+               }
+
+               r = omapfb_memory_read(fbi, &p.memory_read);
+
+               break;
+
+       case OMAPFB_GET_VRAM_INFO: {
+               unsigned long vram, free, largest;
+
+               DBG("ioctl GET_VRAM_INFO\n");
+
+               omap_vram_get_info(&vram, &free, &largest);
+               p.vram_info.total = vram;
+               p.vram_info.free = free;
+               p.vram_info.largest_free_block = largest;
+
+               if (copy_to_user((void __user *)arg, &p.vram_info,
+                                       sizeof(p.vram_info)))
+                       r = -EFAULT;
+               break;
+       }
+
+       case OMAPFB_SET_TEARSYNC: {
+               DBG("ioctl SET_TEARSYNC\n");
+
+               if (copy_from_user(&p.tearsync_info, (void __user *)arg,
+                                       sizeof(p.tearsync_info))) {
+                       r = -EFAULT;
+                       break;
+               }
+
+               if (!display->enable_te) {
+                       r = -ENODEV;
+                       break;
+               }
+
+               r = display->enable_te(display, !!p.tearsync_info.enabled);
+
+               break;
+       }
+
+       default:
+               dev_err(fbdev->dev, "Unknown ioctl 0x%x\n", cmd);
+               r = -EINVAL;
+       }
+
+       if (r < 0)
+               DBG("ioctl failed: %d\n", r);
+
+       return r;
+}
+
+
diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c
new file mode 100644 (file)
index 0000000..ef29983
--- /dev/null
@@ -0,0 +1,2261 @@
+/*
+ * linux/drivers/video/omap2/omapfb-main.c
+ *
+ * Copyright (C) 2008 Nokia Corporation
+ * Author: Tomi Valkeinen <tomi.valkeinen@nokia.com>
+ *
+ * Some code and ideas taken from drivers/video/omap/ driver
+ * by Imre Deak.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <linux/module.h>
+#include <linux/delay.h>
+#include <linux/fb.h>
+#include <linux/dma-mapping.h>
+#include <linux/vmalloc.h>
+#include <linux/device.h>
+#include <linux/platform_device.h>
+#include <linux/omapfb.h>
+
+#include <plat/display.h>
+#include <plat/vram.h>
+#include <plat/vrfb.h>
+
+#include "omapfb.h"
+
+#define MODULE_NAME     "omapfb"
+
+#define OMAPFB_PLANE_XRES_MIN          8
+#define OMAPFB_PLANE_YRES_MIN          8
+
+static char *def_mode;
+static char *def_vram;
+static int def_vrfb;
+static int def_rotate;
+static int def_mirror;
+
+#ifdef DEBUG
+unsigned int omapfb_debug;
+module_param_named(debug, omapfb_debug, bool, 0644);
+static unsigned int omapfb_test_pattern;
+module_param_named(test, omapfb_test_pattern, bool, 0644);
+#endif
+
+static int omapfb_fb_init(struct omapfb2_device *fbdev, struct fb_info *fbi);
+
+#ifdef DEBUG
+static void draw_pixel(struct fb_info *fbi, int x, int y, unsigned color)
+{
+       struct fb_var_screeninfo *var = &fbi->var;
+       struct fb_fix_screeninfo *fix = &fbi->fix;
+       void __iomem *addr = fbi->screen_base;
+       const unsigned bytespp = var->bits_per_pixel >> 3;
+       const unsigned line_len = fix->line_length / bytespp;
+
+       int r = (color >> 16) & 0xff;
+       int g = (color >> 8) & 0xff;
+       int b = (color >> 0) & 0xff;
+
+       if (var->bits_per_pixel == 16) {
+               u16 __iomem *p = (u16 __iomem *)addr;
+               p += y * line_len + x;
+
+               r = r * 32 / 256;
+               g = g * 64 / 256;
+               b = b * 32 / 256;
+
+               __raw_writew((r << 11) | (g << 5) | (b << 0), p);
+       } else if (var->bits_per_pixel == 24) {
+               u8 __iomem *p = (u8 __iomem *)addr;
+               p += (y * line_len + x) * 3;
+
+               __raw_writeb(b, p + 0);
+               __raw_writeb(g, p + 1);
+               __raw_writeb(r, p + 2);
+       } else if (var->bits_per_pixel == 32) {
+               u32 __iomem *p = (u32 __iomem *)addr;
+               p += y * line_len + x;
+               __raw_writel(color, p);
+       }
+}
+
+static void fill_fb(struct fb_info *fbi)
+{
+       struct fb_var_screeninfo *var = &fbi->var;
+       const short w = var->xres_virtual;
+       const short h = var->yres_virtual;
+       void __iomem *addr = fbi->screen_base;
+       int y, x;
+
+       if (!addr)
+               return;
+
+       DBG("fill_fb %dx%d, line_len %d bytes\n", w, h, fbi->fix.line_length);
+
+       for (y = 0; y < h; y++) {
+               for (x = 0; x < w; x++) {
+                       if (x < 20 && y < 20)
+                               draw_pixel(fbi, x, y, 0xffffff);
+                       else if (x < 20 && (y > 20 && y < h - 20))
+                               draw_pixel(fbi, x, y, 0xff);
+                       else if (y < 20 && (x > 20 && x < w - 20))
+                               draw_pixel(fbi, x, y, 0xff00);
+                       else if (x > w - 20 && (y > 20 && y < h - 20))
+                               draw_pixel(fbi, x, y, 0xff0000);
+                       else if (y > h - 20 && (x > 20 && x < w - 20))
+                               draw_pixel(fbi, x, y, 0xffff00);
+                       else if (x == 20 || x == w - 20 ||
+                                       y == 20 || y == h - 20)
+                               draw_pixel(fbi, x, y, 0xffffff);
+                       else if (x == y || w - x == h - y)
+                               draw_pixel(fbi, x, y, 0xff00ff);
+                       else if (w - x == y || x == h - y)
+                               draw_pixel(fbi, x, y, 0x00ffff);
+                       else if (x > 20 && y > 20 && x < w - 20 && y < h - 20) {
+                               int t = x * 3 / w;
+                               unsigned r = 0, g = 0, b = 0;
+                               unsigned c;
+                               if (var->bits_per_pixel == 16) {
+                                       if (t == 0)
+                                               b = (y % 32) * 256 / 32;
+                                       else if (t == 1)
+                                               g = (y % 64) * 256 / 64;
+                                       else if (t == 2)
+                                               r = (y % 32) * 256 / 32;
+                               } else {
+                                       if (t == 0)
+                                               b = (y % 256);
+                                       else if (t == 1)
+                                               g = (y % 256);
+                                       else if (t == 2)
+                                               r = (y % 256);
+                               }
+                               c = (r << 16) | (g << 8) | (b << 0);
+                               draw_pixel(fbi, x, y, c);
+                       } else {
+                               draw_pixel(fbi, x, y, 0);
+                       }
+               }
+       }
+}
+#endif
+
+static unsigned omapfb_get_vrfb_offset(struct omapfb_info *ofbi, int rot)
+{
+       struct vrfb *vrfb = &ofbi->region.vrfb;
+       unsigned offset;
+
+       switch (rot) {
+       case FB_ROTATE_UR:
+               offset = 0;
+               break;
+       case FB_ROTATE_CW:
+               offset = vrfb->yoffset;
+               break;
+       case FB_ROTATE_UD:
+               offset = vrfb->yoffset * OMAP_VRFB_LINE_LEN + vrfb->xoffset;
+               break;
+       case FB_ROTATE_CCW:
+               offset = vrfb->xoffset * OMAP_VRFB_LINE_LEN;
+               break;
+       default:
+               BUG();
+       }
+
+       offset *= vrfb->bytespp;
+
+       return offset;
+}
+
+static u32 omapfb_get_region_rot_paddr(struct omapfb_info *ofbi, int rot)
+{
+       if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB) {
+               return ofbi->region.vrfb.paddr[rot]
+                       + omapfb_get_vrfb_offset(ofbi, rot);
+       } else {
+               return ofbi->region.paddr;
+       }
+}
+
+static u32 omapfb_get_region_paddr(struct omapfb_info *ofbi)
+{
+       if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB)
+               return ofbi->region.vrfb.paddr[0];
+       else
+               return ofbi->region.paddr;
+}
+
+static void __iomem *omapfb_get_region_vaddr(struct omapfb_info *ofbi)
+{
+       if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB)
+               return ofbi->region.vrfb.vaddr[0];
+       else
+               return ofbi->region.vaddr;
+}
+
+static struct omapfb_colormode omapfb_colormodes[] = {
+       {
+               .dssmode = OMAP_DSS_COLOR_UYVY,
+               .bits_per_pixel = 16,
+               .nonstd = OMAPFB_COLOR_YUV422,
+       }, {
+               .dssmode = OMAP_DSS_COLOR_YUV2,
+               .bits_per_pixel = 16,
+               .nonstd = OMAPFB_COLOR_YUY422,
+       }, {
+               .dssmode = OMAP_DSS_COLOR_ARGB16,
+               .bits_per_pixel = 16,
+               .red    = { .length = 4, .offset = 8, .msb_right = 0 },
+               .green  = { .length = 4, .offset = 4, .msb_right = 0 },
+               .blue   = { .length = 4, .offset = 0, .msb_right = 0 },
+               .transp = { .length = 4, .offset = 12, .msb_right = 0 },
+       }, {
+               .dssmode = OMAP_DSS_COLOR_RGB16,
+               .bits_per_pixel = 16,
+               .red    = { .length = 5, .offset = 11, .msb_right = 0 },
+               .green  = { .length = 6, .offset = 5, .msb_right = 0 },
+               .blue   = { .length = 5, .offset = 0, .msb_right = 0 },
+               .transp = { .length = 0, .offset = 0, .msb_right = 0 },
+       }, {
+               .dssmode = OMAP_DSS_COLOR_RGB24P,
+               .bits_per_pixel = 24,
+               .red    = { .length = 8, .offset = 16, .msb_right = 0 },
+               .green  = { .length = 8, .offset = 8, .msb_right = 0 },
+               .blue   = { .length = 8, .offset = 0, .msb_right = 0 },
+               .transp = { .length = 0, .offset = 0, .msb_right = 0 },
+       }, {
+               .dssmode = OMAP_DSS_COLOR_RGB24U,
+               .bits_per_pixel = 32,
+               .red    = { .length = 8, .offset = 16, .msb_right = 0 },
+               .green  = { .length = 8, .offset = 8, .msb_right = 0 },
+               .blue   = { .length = 8, .offset = 0, .msb_right = 0 },
+               .transp = { .length = 0, .offset = 0, .msb_right = 0 },
+       }, {
+               .dssmode = OMAP_DSS_COLOR_ARGB32,
+               .bits_per_pixel = 32,
+               .red    = { .length = 8, .offset = 16, .msb_right = 0 },
+               .green  = { .length = 8, .offset = 8, .msb_right = 0 },
+               .blue   = { .length = 8, .offset = 0, .msb_right = 0 },
+               .transp = { .length = 8, .offset = 24, .msb_right = 0 },
+       }, {
+               .dssmode = OMAP_DSS_COLOR_RGBA32,
+               .bits_per_pixel = 32,
+               .red    = { .length = 8, .offset = 24, .msb_right = 0 },
+               .green  = { .length = 8, .offset = 16, .msb_right = 0 },
+               .blue   = { .length = 8, .offset = 8, .msb_right = 0 },
+               .transp = { .length = 8, .offset = 0, .msb_right = 0 },
+       }, {
+               .dssmode = OMAP_DSS_COLOR_RGBX32,
+               .bits_per_pixel = 32,
+               .red    = { .length = 8, .offset = 24, .msb_right = 0 },
+               .green  = { .length = 8, .offset = 16, .msb_right = 0 },
+               .blue   = { .length = 8, .offset = 8, .msb_right = 0 },
+               .transp = { .length = 0, .offset = 0, .msb_right = 0 },
+       },
+};
+
+static bool cmp_var_to_colormode(struct fb_var_screeninfo *var,
+               struct omapfb_colormode *color)
+{
+       bool cmp_component(struct fb_bitfield *f1, struct fb_bitfield *f2)
+       {
+               return f1->length == f2->length &&
+                       f1->offset == f2->offset &&
+                       f1->msb_right == f2->msb_right;
+       }
+
+       if (var->bits_per_pixel == 0 ||
+                       var->red.length == 0 ||
+                       var->blue.length == 0 ||
+                       var->green.length == 0)
+               return 0;
+
+       return var->bits_per_pixel == color->bits_per_pixel &&
+               cmp_component(&var->red, &color->red) &&
+               cmp_component(&var->green, &color->green) &&
+               cmp_component(&var->blue, &color->blue) &&
+               cmp_component(&var->transp, &color->transp);
+}
+
+static void assign_colormode_to_var(struct fb_var_screeninfo *var,
+               struct omapfb_colormode *color)
+{
+       var->bits_per_pixel = color->bits_per_pixel;
+       var->nonstd = color->nonstd;
+       var->red = color->red;
+       var->green = color->green;
+       var->blue = color->blue;
+       var->transp = color->transp;
+}
+
+static int fb_mode_to_dss_mode(struct fb_var_screeninfo *var,
+               enum omap_color_mode *mode)
+{
+       enum omap_color_mode dssmode;
+       int i;
+
+       /* first match with nonstd field */
+       if (var->nonstd) {
+               for (i = 0; i < ARRAY_SIZE(omapfb_colormodes); ++i) {
+                       struct omapfb_colormode *m = &omapfb_colormodes[i];
+                       if (var->nonstd == m->nonstd) {
+                               assign_colormode_to_var(var, m);
+                               *mode = m->dssmode;
+                               return 0;
+                       }
+               }
+
+               return -EINVAL;
+       }
+
+       /* then try exact match of bpp and colors */
+       for (i = 0; i < ARRAY_SIZE(omapfb_colormodes); ++i) {
+               struct omapfb_colormode *m = &omapfb_colormodes[i];
+               if (cmp_var_to_colormode(var, m)) {
+                       assign_colormode_to_var(var, m);
+                       *mode = m->dssmode;
+                       return 0;
+               }
+       }
+
+       /* match with bpp if user has not filled color fields
+        * properly */
+       switch (var->bits_per_pixel) {
+       case 1:
+               dssmode = OMAP_DSS_COLOR_CLUT1;
+               break;
+       case 2:
+               dssmode = OMAP_DSS_COLOR_CLUT2;
+               break;
+       case 4:
+               dssmode = OMAP_DSS_COLOR_CLUT4;
+               break;
+       case 8:
+               dssmode = OMAP_DSS_COLOR_CLUT8;
+               break;
+       case 12:
+               dssmode = OMAP_DSS_COLOR_RGB12U;
+               break;
+       case 16:
+               dssmode = OMAP_DSS_COLOR_RGB16;
+               break;
+       case 24:
+               dssmode = OMAP_DSS_COLOR_RGB24P;
+               break;
+       case 32:
+               dssmode = OMAP_DSS_COLOR_RGB24U;
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       for (i = 0; i < ARRAY_SIZE(omapfb_colormodes); ++i) {
+               struct omapfb_colormode *m = &omapfb_colormodes[i];
+               if (dssmode == m->dssmode) {
+                       assign_colormode_to_var(var, m);
+                       *mode = m->dssmode;
+                       return 0;
+               }
+       }
+
+       return -EINVAL;
+}
+
+static int check_fb_res_bounds(struct fb_var_screeninfo *var)
+{
+       int xres_min = OMAPFB_PLANE_XRES_MIN;
+       int xres_max = 2048;
+       int yres_min = OMAPFB_PLANE_YRES_MIN;
+       int yres_max = 2048;
+
+       /* XXX: some applications seem to set virtual res to 0. */
+       if (var->xres_virtual == 0)
+               var->xres_virtual = var->xres;
+
+       if (var->yres_virtual == 0)
+               var->yres_virtual = var->yres;
+
+       if (var->xres_virtual < xres_min || var->yres_virtual < yres_min)
+               return -EINVAL;
+
+       if (var->xres < xres_min)
+               var->xres = xres_min;
+       if (var->yres < yres_min)
+               var->yres = yres_min;
+       if (var->xres > xres_max)
+               var->xres = xres_max;
+       if (var->yres > yres_max)
+               var->yres = yres_max;
+
+       if (var->xres > var->xres_virtual)
+               var->xres = var->xres_virtual;
+       if (var->yres > var->yres_virtual)
+               var->yres = var->yres_virtual;
+
+       return 0;
+}
+
+static void shrink_height(unsigned long max_frame_size,
+               struct fb_var_screeninfo *var)
+{
+       DBG("can't fit FB into memory, reducing y\n");
+       var->yres_virtual = max_frame_size /
+               (var->xres_virtual * var->bits_per_pixel >> 3);
+
+       if (var->yres_virtual < OMAPFB_PLANE_YRES_MIN)
+               var->yres_virtual = OMAPFB_PLANE_YRES_MIN;
+
+       if (var->yres > var->yres_virtual)
+               var->yres = var->yres_virtual;
+}
+
+static void shrink_width(unsigned long max_frame_size,
+               struct fb_var_screeninfo *var)
+{
+       DBG("can't fit FB into memory, reducing x\n");
+       var->xres_virtual = max_frame_size / var->yres_virtual /
+               (var->bits_per_pixel >> 3);
+
+       if (var->xres_virtual < OMAPFB_PLANE_XRES_MIN)
+               var->xres_virtual = OMAPFB_PLANE_XRES_MIN;
+
+       if (var->xres > var->xres_virtual)
+               var->xres = var->xres_virtual;
+}
+
+static int check_vrfb_fb_size(unsigned long region_size,
+               const struct fb_var_screeninfo *var)
+{
+       unsigned long min_phys_size = omap_vrfb_min_phys_size(var->xres_virtual,
+               var->yres_virtual, var->bits_per_pixel >> 3);
+
+       return min_phys_size > region_size ? -EINVAL : 0;
+}
+
+static int check_fb_size(const struct omapfb_info *ofbi,
+               struct fb_var_screeninfo *var)
+{
+       unsigned long max_frame_size = ofbi->region.size;
+       int bytespp = var->bits_per_pixel >> 3;
+       unsigned long line_size = var->xres_virtual * bytespp;
+
+       if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB) {
+               /* One needs to check for both VRFB and OMAPFB limitations. */
+               if (check_vrfb_fb_size(max_frame_size, var))
+                       shrink_height(omap_vrfb_max_height(
+                               max_frame_size, var->xres_virtual, bytespp) *
+                               line_size, var);
+
+               if (check_vrfb_fb_size(max_frame_size, var)) {
+                       DBG("cannot fit FB to memory\n");
+                       return -EINVAL;
+               }
+
+               return 0;
+       }
+
+       DBG("max frame size %lu, line size %lu\n", max_frame_size, line_size);
+
+       if (line_size * var->yres_virtual > max_frame_size)
+               shrink_height(max_frame_size, var);
+
+       if (line_size * var->yres_virtual > max_frame_size) {
+               shrink_width(max_frame_size, var);
+               line_size = var->xres_virtual * bytespp;
+       }
+
+       if (line_size * var->yres_virtual > max_frame_size) {
+               DBG("cannot fit FB to memory\n");
+               return -EINVAL;
+       }
+
+       return 0;
+}
+
+/*
+ * Consider if VRFB assisted rotation is in use and if the virtual space for
+ * the zero degree view needs to be mapped. The need for mapping also acts as
+ * the trigger for setting up the hardware on the context in question. This
+ * ensures that one does not attempt to access the virtual view before the
+ * hardware is serving the address translations.
+ */
+static int setup_vrfb_rotation(struct fb_info *fbi)
+{
+       struct omapfb_info *ofbi = FB2OFB(fbi);
+       struct omapfb2_mem_region *rg = &ofbi->region;
+       struct vrfb *vrfb = &rg->vrfb;
+       struct fb_var_screeninfo *var = &fbi->var;
+       struct fb_fix_screeninfo *fix = &fbi->fix;
+       unsigned bytespp;
+       bool yuv_mode;
+       enum omap_color_mode mode;
+       int r;
+       bool reconf;
+
+       if (!rg->size || ofbi->rotation_type != OMAP_DSS_ROT_VRFB)
+               return 0;
+
+       DBG("setup_vrfb_rotation\n");
+
+       r = fb_mode_to_dss_mode(var, &mode);
+       if (r)
+               return r;
+
+       bytespp = var->bits_per_pixel >> 3;
+
+       yuv_mode = mode == OMAP_DSS_COLOR_YUV2 || mode == OMAP_DSS_COLOR_UYVY;
+
+       /* We need to reconfigure VRFB if the resolution changes, if yuv mode
+        * is enabled/disabled, or if bytes per pixel changes */
+
+       /* XXX we shouldn't allow this when framebuffer is mmapped */
+
+       reconf = false;
+
+       if (yuv_mode != vrfb->yuv_mode)
+               reconf = true;
+       else if (bytespp != vrfb->bytespp)
+               reconf = true;
+       else if (vrfb->xres != var->xres_virtual ||
+                       vrfb->yres != var->yres_virtual)
+               reconf = true;
+
+       if (vrfb->vaddr[0] && reconf) {
+               fbi->screen_base = NULL;
+               fix->smem_start = 0;
+               fix->smem_len = 0;
+               iounmap(vrfb->vaddr[0]);
+               vrfb->vaddr[0] = NULL;
+               DBG("setup_vrfb_rotation: reset fb\n");
+       }
+
+       if (vrfb->vaddr[0])
+               return 0;
+
+       omap_vrfb_setup(&rg->vrfb, rg->paddr,
+                       var->xres_virtual,
+                       var->yres_virtual,
+                       bytespp, yuv_mode);
+
+       /* Now one can ioremap the 0 angle view */
+       r = omap_vrfb_map_angle(vrfb, var->yres_virtual, 0);
+       if (r)
+               return r;
+
+       /* used by open/write in fbmem.c */
+       fbi->screen_base = ofbi->region.vrfb.vaddr[0];
+
+       fix->smem_start = ofbi->region.vrfb.paddr[0];
+
+       switch (var->nonstd) {
+       case OMAPFB_COLOR_YUV422:
+       case OMAPFB_COLOR_YUY422:
+               fix->line_length =
+                       (OMAP_VRFB_LINE_LEN * var->bits_per_pixel) >> 2;
+               break;
+       default:
+               fix->line_length =
+                       (OMAP_VRFB_LINE_LEN * var->bits_per_pixel) >> 3;
+               break;
+       }
+
+       fix->smem_len = var->yres_virtual * fix->line_length;
+
+       return 0;
+}
+
+int dss_mode_to_fb_mode(enum omap_color_mode dssmode,
+                       struct fb_var_screeninfo *var)
+{
+       int i;
+
+       for (i = 0; i < ARRAY_SIZE(omapfb_colormodes); ++i) {
+               struct omapfb_colormode *mode = &omapfb_colormodes[i];
+               if (dssmode == mode->dssmode) {
+                       assign_colormode_to_var(var, mode);
+                       return 0;
+               }
+       }
+       return -ENOENT;
+}
+
+void set_fb_fix(struct fb_info *fbi)
+{
+       struct fb_fix_screeninfo *fix = &fbi->fix;
+       struct fb_var_screeninfo *var = &fbi->var;
+       struct omapfb_info *ofbi = FB2OFB(fbi);
+       struct omapfb2_mem_region *rg = &ofbi->region;
+
+       DBG("set_fb_fix\n");
+
+       /* used by open/write in fbmem.c */
+       fbi->screen_base = (char __iomem *)omapfb_get_region_vaddr(ofbi);
+
+       /* used by mmap in fbmem.c */
+       if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB) {
+               switch (var->nonstd) {
+               case OMAPFB_COLOR_YUV422:
+               case OMAPFB_COLOR_YUY422:
+                       fix->line_length =
+                               (OMAP_VRFB_LINE_LEN * var->bits_per_pixel) >> 2;
+                       break;
+               default:
+                       fix->line_length =
+                               (OMAP_VRFB_LINE_LEN * var->bits_per_pixel) >> 3;
+                       break;
+               }
+
+               fix->smem_len = var->yres_virtual * fix->line_length;
+       } else {
+               fix->line_length =
+                       (var->xres_virtual * var->bits_per_pixel) >> 3;
+               fix->smem_len = rg->size;
+       }
+
+       fix->smem_start = omapfb_get_region_paddr(ofbi);
+
+       fix->type = FB_TYPE_PACKED_PIXELS;
+
+       if (var->nonstd)
+               fix->visual = FB_VISUAL_PSEUDOCOLOR;
+       else {
+               switch (var->bits_per_pixel) {
+               case 32:
+               case 24:
+               case 16:
+               case 12:
+                       fix->visual = FB_VISUAL_TRUECOLOR;
+                       /* 12bpp is stored in 16 bits */
+                       break;
+               case 1:
+               case 2:
+               case 4:
+               case 8:
+                       fix->visual = FB_VISUAL_PSEUDOCOLOR;
+                       break;
+               }
+       }
+
+       fix->accel = FB_ACCEL_NONE;
+
+       fix->xpanstep = 1;
+       fix->ypanstep = 1;
+}
+
+/* check new var and possibly modify it to be ok */
+int check_fb_var(struct fb_info *fbi, struct fb_var_screeninfo *var)
+{
+       struct omapfb_info *ofbi = FB2OFB(fbi);
+       struct omap_dss_device *display = fb2display(fbi);
+       enum omap_color_mode mode = 0;
+       int i;
+       int r;
+
+       DBG("check_fb_var %d\n", ofbi->id);
+
+       if (ofbi->region.size == 0)
+               return 0;
+
+       r = fb_mode_to_dss_mode(var, &mode);
+       if (r) {
+               DBG("cannot convert var to omap dss mode\n");
+               return r;
+       }
+
+       for (i = 0; i < ofbi->num_overlays; ++i) {
+               if ((ofbi->overlays[i]->supported_modes & mode) == 0) {
+                       DBG("invalid mode\n");
+                       return -EINVAL;
+               }
+       }
+
+       if (var->rotate < 0 || var->rotate > 3)
+               return -EINVAL;
+
+       if (check_fb_res_bounds(var))
+               return -EINVAL;
+
+       if (check_fb_size(ofbi, var))
+               return -EINVAL;
+
+       if (var->xres + var->xoffset > var->xres_virtual)
+               var->xoffset = var->xres_virtual - var->xres;
+       if (var->yres + var->yoffset > var->yres_virtual)
+               var->yoffset = var->yres_virtual - var->yres;
+
+       DBG("xres = %d, yres = %d, vxres = %d, vyres = %d\n",
+                       var->xres, var->yres,
+                       var->xres_virtual, var->yres_virtual);
+
+       var->height             = -1;
+       var->width              = -1;
+       var->grayscale          = 0;
+
+       if (display && display->get_timings) {
+               struct omap_video_timings timings;
+               display->get_timings(display, &timings);
+
+               /* pixclock in ps, the rest in pixclock */
+               var->pixclock = timings.pixel_clock != 0 ?
+                       KHZ2PICOS(timings.pixel_clock) :
+                       0;
+               var->left_margin = timings.hfp;
+               var->right_margin = timings.hbp;
+               var->upper_margin = timings.vfp;
+               var->lower_margin = timings.vbp;
+               var->hsync_len = timings.hsw;
+               var->vsync_len = timings.vsw;
+       } else {
+               var->pixclock = 0;
+               var->left_margin = 0;
+               var->right_margin = 0;
+               var->upper_margin = 0;
+               var->lower_margin = 0;
+               var->hsync_len = 0;
+               var->vsync_len = 0;
+       }
+
+       /* TODO: get these from panel->config */
+       var->vmode              = FB_VMODE_NONINTERLACED;
+       var->sync               = 0;
+
+       return 0;
+}
+
+/*
+ * ---------------------------------------------------------------------------
+ * fbdev framework callbacks
+ * ---------------------------------------------------------------------------
+ */
+static int omapfb_open(struct fb_info *fbi, int user)
+{
+       return 0;
+}
+
+static int omapfb_release(struct fb_info *fbi, int user)
+{
+#if 0
+       struct omapfb_info *ofbi = FB2OFB(fbi);
+       struct omapfb2_device *fbdev = ofbi->fbdev;
+       struct omap_dss_device *display = fb2display(fbi);
+
+       DBG("Closing fb with plane index %d\n", ofbi->id);
+
+       omapfb_lock(fbdev);
+
+       if (display && display->get_update_mode && display->update) {
+               /* XXX this update should be removed, I think. But it's
+                * good for debugging */
+               if (display->get_update_mode(display) ==
+                               OMAP_DSS_UPDATE_MANUAL) {
+                       u16 w, h;
+
+                       if (display->sync)
+                               display->sync(display);
+
+                       display->get_resolution(display, &w, &h);
+                       display->update(display, 0, 0, w, h);
+               }
+       }
+
+       if (display && display->sync)
+               display->sync(display);
+
+       omapfb_unlock(fbdev);
+#endif
+       return 0;
+}
+
+static unsigned calc_rotation_offset_dma(struct fb_var_screeninfo *var,
+               struct fb_fix_screeninfo *fix, int rotation)
+{
+       unsigned offset;
+
+       offset = var->yoffset * fix->line_length +
+               var->xoffset * (var->bits_per_pixel >> 3);
+
+       return offset;
+}
+
+static unsigned calc_rotation_offset_vrfb(struct fb_var_screeninfo *var,
+               struct fb_fix_screeninfo *fix, int rotation)
+{
+       unsigned offset;
+
+       if (rotation == FB_ROTATE_UD)
+               offset = (var->yres_virtual - var->yres) *
+                       fix->line_length;
+       else if (rotation == FB_ROTATE_CW)
+               offset = (var->yres_virtual - var->yres) *
+                       (var->bits_per_pixel >> 3);
+       else
+               offset = 0;
+
+       if (rotation == FB_ROTATE_UR)
+               offset += var->yoffset * fix->line_length +
+                       var->xoffset * (var->bits_per_pixel >> 3);
+       else if (rotation == FB_ROTATE_UD)
+               offset -= var->yoffset * fix->line_length +
+                       var->xoffset * (var->bits_per_pixel >> 3);
+       else if (rotation == FB_ROTATE_CW)
+               offset -= var->xoffset * fix->line_length +
+                       var->yoffset * (var->bits_per_pixel >> 3);
+       else if (rotation == FB_ROTATE_CCW)
+               offset += var->xoffset * fix->line_length +
+                       var->yoffset * (var->bits_per_pixel >> 3);
+
+       return offset;
+}
+
+
+/* setup overlay according to the fb */
+static int omapfb_setup_overlay(struct fb_info *fbi, struct omap_overlay *ovl,
+               u16 posx, u16 posy, u16 outw, u16 outh)
+{
+       int r = 0;
+       struct omapfb_info *ofbi = FB2OFB(fbi);
+       struct fb_var_screeninfo *var = &fbi->var;
+       struct fb_fix_screeninfo *fix = &fbi->fix;
+       enum omap_color_mode mode = 0;
+       int offset;
+       u32 data_start_p;
+       void __iomem *data_start_v;
+       struct omap_overlay_info info;
+       int xres, yres;
+       int screen_width;
+       int mirror;
+       int rotation = var->rotate;
+       int i;
+
+       for (i = 0; i < ofbi->num_overlays; i++) {
+               if (ovl != ofbi->overlays[i])
+                       continue;
+
+               rotation = (rotation + ofbi->rotation[i]) % 4;
+               break;
+       }
+
+       DBG("setup_overlay %d, posx %d, posy %d, outw %d, outh %d\n", ofbi->id,
+                       posx, posy, outw, outh);
+
+       if (rotation == FB_ROTATE_CW || rotation == FB_ROTATE_CCW) {
+               xres = var->yres;
+               yres = var->xres;
+       } else {
+               xres = var->xres;
+               yres = var->yres;
+       }
+
+
+       if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB) {
+               data_start_p = omapfb_get_region_rot_paddr(ofbi, rotation);
+               data_start_v = NULL;
+       } else {
+               data_start_p = omapfb_get_region_paddr(ofbi);
+               data_start_v = omapfb_get_region_vaddr(ofbi);
+       }
+
+       if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB)
+               offset = calc_rotation_offset_vrfb(var, fix, rotation);
+       else
+               offset = calc_rotation_offset_dma(var, fix, rotation);
+
+       data_start_p += offset;
+       data_start_v += offset;
+
+       if (offset)
+               DBG("offset %d, %d = %d\n",
+                               var->xoffset, var->yoffset, offset);
+
+       DBG("paddr %x, vaddr %p\n", data_start_p, data_start_v);
+
+       r = fb_mode_to_dss_mode(var, &mode);
+       if (r) {
+               DBG("fb_mode_to_dss_mode failed");
+               goto err;
+       }
+
+       switch (var->nonstd) {
+       case OMAPFB_COLOR_YUV422:
+       case OMAPFB_COLOR_YUY422:
+               if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB) {
+                       screen_width = fix->line_length
+                               / (var->bits_per_pixel >> 2);
+                       break;
+               }
+       default:
+               screen_width = fix->line_length / (var->bits_per_pixel >> 3);
+               break;
+       }
+
+       ovl->get_overlay_info(ovl, &info);
+
+       if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB)
+               mirror = 0;
+       else
+               mirror = ofbi->mirror;
+
+       info.paddr = data_start_p;
+       info.vaddr = data_start_v;
+       info.screen_width = screen_width;
+       info.width = xres;
+       info.height = yres;
+       info.color_mode = mode;
+       info.rotation_type = ofbi->rotation_type;
+       info.rotation = rotation;
+       info.mirror = mirror;
+
+       info.pos_x = posx;
+       info.pos_y = posy;
+       info.out_width = outw;
+       info.out_height = outh;
+
+       r = ovl->set_overlay_info(ovl, &info);
+       if (r) {
+               DBG("ovl->setup_overlay_info failed\n");
+               goto err;
+       }
+
+       return 0;
+
+err:
+       DBG("setup_overlay failed\n");
+       return r;
+}
+
+/* apply var to the overlay */
+int omapfb_apply_changes(struct fb_info *fbi, int init)
+{
+       int r = 0;
+       struct omapfb_info *ofbi = FB2OFB(fbi);
+       struct fb_var_screeninfo *var = &fbi->var;
+       struct omap_overlay *ovl;
+       u16 posx, posy;
+       u16 outw, outh;
+       int i;
+
+#ifdef DEBUG
+       if (omapfb_test_pattern)
+               fill_fb(fbi);
+#endif
+
+       for (i = 0; i < ofbi->num_overlays; i++) {
+               ovl = ofbi->overlays[i];
+
+               DBG("apply_changes, fb %d, ovl %d\n", ofbi->id, ovl->id);
+
+               if (ofbi->region.size == 0) {
+                       /* the fb is not available. disable the overlay */
+                       omapfb_overlay_enable(ovl, 0);
+                       if (!init && ovl->manager)
+                               ovl->manager->apply(ovl->manager);
+                       continue;
+               }
+
+               if (init || (ovl->caps & OMAP_DSS_OVL_CAP_SCALE) == 0) {
+                       int rotation = (var->rotate + ofbi->rotation[i]) % 4;
+                       if (rotation == FB_ROTATE_CW ||
+                                       rotation == FB_ROTATE_CCW) {
+                               outw = var->yres;
+                               outh = var->xres;
+                       } else {
+                               outw = var->xres;
+                               outh = var->yres;
+                       }
+               } else {
+                       outw = ovl->info.out_width;
+                       outh = ovl->info.out_height;
+               }
+
+               if (init) {
+                       posx = 0;
+                       posy = 0;
+               } else {
+                       posx = ovl->info.pos_x;
+                       posy = ovl->info.pos_y;
+               }
+
+               r = omapfb_setup_overlay(fbi, ovl, posx, posy, outw, outh);
+               if (r)
+                       goto err;
+
+               if (!init && ovl->manager)
+                       ovl->manager->apply(ovl->manager);
+       }
+       return 0;
+err:
+       DBG("apply_changes failed\n");
+       return r;
+}
+
+/* checks var and eventually tweaks it to something supported,
+ * DO NOT MODIFY PAR */
+static int omapfb_check_var(struct fb_var_screeninfo *var, struct fb_info *fbi)
+{
+       int r;
+
+       DBG("check_var(%d)\n", FB2OFB(fbi)->id);
+
+       r = check_fb_var(fbi, var);
+
+       return r;
+}
+
+/* set the video mode according to info->var */
+static int omapfb_set_par(struct fb_info *fbi)
+{
+       int r;
+
+       DBG("set_par(%d)\n", FB2OFB(fbi)->id);
+
+       set_fb_fix(fbi);
+
+       r = setup_vrfb_rotation(fbi);
+       if (r)
+               return r;
+
+       r = omapfb_apply_changes(fbi, 0);
+
+       return r;
+}
+
+static int omapfb_pan_display(struct fb_var_screeninfo *var,
+               struct fb_info *fbi)
+{
+       struct fb_var_screeninfo new_var;
+       int r;
+
+       DBG("pan_display(%d)\n", FB2OFB(fbi)->id);
+
+       if (var->xoffset == fbi->var.xoffset &&
+           var->yoffset == fbi->var.yoffset)
+               return 0;
+
+       new_var = fbi->var;
+       new_var.xoffset = var->xoffset;
+       new_var.yoffset = var->yoffset;
+
+       fbi->var = new_var;
+
+       r = omapfb_apply_changes(fbi, 0);
+
+       return r;
+}
+
+static void mmap_user_open(struct vm_area_struct *vma)
+{
+       struct omapfb_info *ofbi = (struct omapfb_info *)vma->vm_private_data;
+
+       atomic_inc(&ofbi->map_count);
+}
+
+static void mmap_user_close(struct vm_area_struct *vma)
+{
+       struct omapfb_info *ofbi = (struct omapfb_info *)vma->vm_private_data;
+
+       atomic_dec(&ofbi->map_count);
+}
+
+static struct vm_operations_struct mmap_user_ops = {
+       .open = mmap_user_open,
+       .close = mmap_user_close,
+};
+
+static int omapfb_mmap(struct fb_info *fbi, struct vm_area_struct *vma)
+{
+       struct omapfb_info *ofbi = FB2OFB(fbi);
+       struct fb_fix_screeninfo *fix = &fbi->fix;
+       unsigned long off;
+       unsigned long start;
+       u32 len;
+
+       if (vma->vm_end - vma->vm_start == 0)
+               return 0;
+       if (vma->vm_pgoff > (~0UL >> PAGE_SHIFT))
+               return -EINVAL;
+       off = vma->vm_pgoff << PAGE_SHIFT;
+
+       start = omapfb_get_region_paddr(ofbi);
+       len = fix->smem_len;
+       if (off >= len)
+               return -EINVAL;
+       if ((vma->vm_end - vma->vm_start + off) > len)
+               return -EINVAL;
+
+       off += start;
+
+       DBG("user mmap region start %lx, len %d, off %lx\n", start, len, off);
+
+       vma->vm_pgoff = off >> PAGE_SHIFT;
+       vma->vm_flags |= VM_IO | VM_RESERVED;
+       vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot);
+       vma->vm_ops = &mmap_user_ops;
+       vma->vm_private_data = ofbi;
+       if (io_remap_pfn_range(vma, vma->vm_start, off >> PAGE_SHIFT,
+                            vma->vm_end - vma->vm_start, vma->vm_page_prot))
+               return -EAGAIN;
+       /* vm_ops.open won't be called for mmap itself. */
+       atomic_inc(&ofbi->map_count);
+       return 0;
+}
+
+/* Store a single color palette entry into a pseudo palette or the hardware
+ * palette if one is available. For now we support only 16bpp and thus store
+ * the entry only to the pseudo palette.
+ */
+static int _setcolreg(struct fb_info *fbi, u_int regno, u_int red, u_int green,
+               u_int blue, u_int transp, int update_hw_pal)
+{
+       /*struct omapfb_info *ofbi = FB2OFB(fbi);*/
+       /*struct omapfb2_device *fbdev = ofbi->fbdev;*/
+       struct fb_var_screeninfo *var = &fbi->var;
+       int r = 0;
+
+       enum omapfb_color_format mode = OMAPFB_COLOR_RGB24U; /* XXX */
+
+       /*switch (plane->color_mode) {*/
+       switch (mode) {
+       case OMAPFB_COLOR_YUV422:
+       case OMAPFB_COLOR_YUV420:
+       case OMAPFB_COLOR_YUY422:
+               r = -EINVAL;
+               break;
+       case OMAPFB_COLOR_CLUT_8BPP:
+       case OMAPFB_COLOR_CLUT_4BPP:
+       case OMAPFB_COLOR_CLUT_2BPP:
+       case OMAPFB_COLOR_CLUT_1BPP:
+               /*
+                  if (fbdev->ctrl->setcolreg)
+                  r = fbdev->ctrl->setcolreg(regno, red, green, blue,
+                  transp, update_hw_pal);
+                  */
+               /* Fallthrough */
+               r = -EINVAL;
+               break;
+       case OMAPFB_COLOR_RGB565:
+       case OMAPFB_COLOR_RGB444:
+       case OMAPFB_COLOR_RGB24P:
+       case OMAPFB_COLOR_RGB24U:
+               if (r != 0)
+                       break;
+
+               if (regno < 0) {
+                       r = -EINVAL;
+                       break;
+               }
+
+               if (regno < 16) {
+                       u16 pal;
+                       pal = ((red >> (16 - var->red.length)) <<
+                                       var->red.offset) |
+                               ((green >> (16 - var->green.length)) <<
+                                var->green.offset) |
+                               (blue >> (16 - var->blue.length));
+                       ((u32 *)(fbi->pseudo_palette))[regno] = pal;
+               }
+               break;
+       default:
+               BUG();
+       }
+       return r;
+}
+
+static int omapfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
+               u_int transp, struct fb_info *info)
+{
+       DBG("setcolreg\n");
+
+       return _setcolreg(info, regno, red, green, blue, transp, 1);
+}
+
+static int omapfb_setcmap(struct fb_cmap *cmap, struct fb_info *info)
+{
+       int count, index, r;
+       u16 *red, *green, *blue, *transp;
+       u16 trans = 0xffff;
+
+       DBG("setcmap\n");
+
+       red     = cmap->red;
+       green   = cmap->green;
+       blue    = cmap->blue;
+       transp  = cmap->transp;
+       index   = cmap->start;
+
+       for (count = 0; count < cmap->len; count++) {
+               if (transp)
+                       trans = *transp++;
+               r = _setcolreg(info, index++, *red++, *green++, *blue++, trans,
+                               count == cmap->len - 1);
+               if (r != 0)
+                       return r;
+       }
+
+       return 0;
+}
+
+static int omapfb_blank(int blank, struct fb_info *fbi)
+{
+       struct omapfb_info *ofbi = FB2OFB(fbi);
+       struct omapfb2_device *fbdev = ofbi->fbdev;
+       struct omap_dss_device *display = fb2display(fbi);
+       int do_update = 0;
+       int r = 0;
+
+       omapfb_lock(fbdev);
+
+       switch (blank) {
+       case FB_BLANK_UNBLANK:
+               if (display->state != OMAP_DSS_DISPLAY_SUSPENDED)
+                       goto exit;
+
+               if (display->resume)
+                       r = display->resume(display);
+
+               if (r == 0 && display->get_update_mode &&
+                               display->get_update_mode(display) ==
+                               OMAP_DSS_UPDATE_MANUAL)
+                       do_update = 1;
+
+               break;
+
+       case FB_BLANK_NORMAL:
+               /* FB_BLANK_NORMAL could be implemented.
+                * Needs DSS additions. */
+       case FB_BLANK_VSYNC_SUSPEND:
+       case FB_BLANK_HSYNC_SUSPEND:
+       case FB_BLANK_POWERDOWN:
+               if (display->state != OMAP_DSS_DISPLAY_ACTIVE)
+                       goto exit;
+
+               if (display->suspend)
+                       r = display->suspend(display);
+
+               break;
+
+       default:
+               r = -EINVAL;
+       }
+
+exit:
+       omapfb_unlock(fbdev);
+
+       if (r == 0 && do_update && display->update) {
+               u16 w, h;
+               display->get_resolution(display, &w, &h);
+
+               r = display->update(display, 0, 0, w, h);
+       }
+
+       return r;
+}
+
+#if 0
+/* XXX fb_read and fb_write are needed for VRFB */
+ssize_t omapfb_write(struct fb_info *info, const char __user *buf,
+               size_t count, loff_t *ppos)
+{
+       DBG("omapfb_write %d, %lu\n", count, (unsigned long)*ppos);
+       /* XXX needed for VRFB */
+       return count;
+}
+#endif
+
+static struct fb_ops omapfb_ops = {
+       .owner          = THIS_MODULE,
+       .fb_open        = omapfb_open,
+       .fb_release     = omapfb_release,
+       .fb_fillrect    = cfb_fillrect,
+       .fb_copyarea    = cfb_copyarea,
+       .fb_imageblit   = cfb_imageblit,
+       .fb_blank       = omapfb_blank,
+       .fb_ioctl       = omapfb_ioctl,
+       .fb_check_var   = omapfb_check_var,
+       .fb_set_par     = omapfb_set_par,
+       .fb_pan_display = omapfb_pan_display,
+       .fb_mmap        = omapfb_mmap,
+       .fb_setcolreg   = omapfb_setcolreg,
+       .fb_setcmap     = omapfb_setcmap,
+       /*.fb_write     = omapfb_write,*/
+};
+
+static void omapfb_free_fbmem(struct fb_info *fbi)
+{
+       struct omapfb_info *ofbi = FB2OFB(fbi);
+       struct omapfb2_device *fbdev = ofbi->fbdev;
+       struct omapfb2_mem_region *rg;
+
+       rg = &ofbi->region;
+
+       if (rg->paddr)
+               if (omap_vram_free(rg->paddr, rg->size))
+                       dev_err(fbdev->dev, "VRAM FREE failed\n");
+
+       if (rg->vaddr)
+               iounmap(rg->vaddr);
+
+       if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB) {
+               /* unmap the 0 angle rotation */
+               if (rg->vrfb.vaddr[0]) {
+                       iounmap(rg->vrfb.vaddr[0]);
+                       omap_vrfb_release_ctx(&rg->vrfb);
+               }
+       }
+
+       rg->vaddr = NULL;
+       rg->paddr = 0;
+       rg->alloc = 0;
+       rg->size = 0;
+}
+
+static void clear_fb_info(struct fb_info *fbi)
+{
+       memset(&fbi->var, 0, sizeof(fbi->var));
+       memset(&fbi->fix, 0, sizeof(fbi->fix));
+       strlcpy(fbi->fix.id, MODULE_NAME, sizeof(fbi->fix.id));
+}
+
+static int omapfb_free_all_fbmem(struct omapfb2_device *fbdev)
+{
+       int i;
+
+       DBG("free all fbmem\n");
+
+       for (i = 0; i < fbdev->num_fbs; i++) {
+               struct fb_info *fbi = fbdev->fbs[i];
+               omapfb_free_fbmem(fbi);
+               clear_fb_info(fbi);
+       }
+
+       return 0;
+}
+
+static int omapfb_alloc_fbmem(struct fb_info *fbi, unsigned long size,
+               unsigned long paddr)
+{
+       struct omapfb_info *ofbi = FB2OFB(fbi);
+       struct omapfb2_device *fbdev = ofbi->fbdev;
+       struct omapfb2_mem_region *rg;
+       void __iomem *vaddr;
+       int r;
+
+       rg = &ofbi->region;
+       memset(rg, 0, sizeof(*rg));
+
+       size = PAGE_ALIGN(size);
+
+       if (!paddr) {
+               DBG("allocating %lu bytes for fb %d\n", size, ofbi->id);
+               r = omap_vram_alloc(OMAP_VRAM_MEMTYPE_SDRAM, size, &paddr);
+       } else {
+               DBG("reserving %lu bytes at %lx for fb %d\n", size, paddr,
+                               ofbi->id);
+               r = omap_vram_reserve(paddr, size);
+       }
+
+       if (r) {
+               dev_err(fbdev->dev, "failed to allocate framebuffer\n");
+               return -ENOMEM;
+       }
+
+       if (ofbi->rotation_type != OMAP_DSS_ROT_VRFB) {
+               vaddr = ioremap_wc(paddr, size);
+
+               if (!vaddr) {
+                       dev_err(fbdev->dev, "failed to ioremap framebuffer\n");
+                       omap_vram_free(paddr, size);
+                       return -ENOMEM;
+               }
+
+               DBG("allocated VRAM paddr %lx, vaddr %p\n", paddr, vaddr);
+       } else {
+               r = omap_vrfb_request_ctx(&rg->vrfb);
+               if (r) {
+                       dev_err(fbdev->dev, "vrfb create ctx failed\n");
+                       return r;
+               }
+
+               vaddr = NULL;
+       }
+
+       rg->paddr = paddr;
+       rg->vaddr = vaddr;
+       rg->size = size;
+       rg->alloc = 1;
+
+       return 0;
+}
+
+/* allocate fbmem using display resolution as reference */
+static int omapfb_alloc_fbmem_display(struct fb_info *fbi, unsigned long size,
+               unsigned long paddr)
+{
+       struct omapfb_info *ofbi = FB2OFB(fbi);
+       struct omap_dss_device *display;
+       int bytespp;
+
+       display =  fb2display(fbi);
+
+       if (!display)
+               return 0;
+
+       switch (display->get_recommended_bpp(display)) {
+       case 16:
+               bytespp = 2;
+               break;
+       case 24:
+               bytespp = 4;
+               break;
+       default:
+               bytespp = 4;
+               break;
+       }
+
+       if (!size) {
+               u16 w, h;
+
+               display->get_resolution(display, &w, &h);
+
+               if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB) {
+                       size = max(omap_vrfb_min_phys_size(w, h, bytespp),
+                                       omap_vrfb_min_phys_size(h, w, bytespp));
+
+                       DBG("adjusting fb mem size for VRFB, %u -> %lu\n",
+                                       w * h * bytespp, size);
+               } else {
+                       size = w * h * bytespp;
+               }
+       }
+
+       if (!size)
+               return 0;
+
+       return omapfb_alloc_fbmem(fbi, size, paddr);
+}
+
+static enum omap_color_mode fb_format_to_dss_mode(enum omapfb_color_format fmt)
+{
+       enum omap_color_mode mode;
+
+       switch (fmt) {
+       case OMAPFB_COLOR_RGB565:
+               mode = OMAP_DSS_COLOR_RGB16;
+               break;
+       case OMAPFB_COLOR_YUV422:
+               mode = OMAP_DSS_COLOR_YUV2;
+               break;
+       case OMAPFB_COLOR_CLUT_8BPP:
+               mode = OMAP_DSS_COLOR_CLUT8;
+               break;
+       case OMAPFB_COLOR_CLUT_4BPP:
+               mode = OMAP_DSS_COLOR_CLUT4;
+               break;
+       case OMAPFB_COLOR_CLUT_2BPP:
+               mode = OMAP_DSS_COLOR_CLUT2;
+               break;
+       case OMAPFB_COLOR_CLUT_1BPP:
+               mode = OMAP_DSS_COLOR_CLUT1;
+               break;
+       case OMAPFB_COLOR_RGB444:
+               mode = OMAP_DSS_COLOR_RGB12U;
+               break;
+       case OMAPFB_COLOR_YUY422:
+               mode = OMAP_DSS_COLOR_UYVY;
+               break;
+       case OMAPFB_COLOR_ARGB16:
+               mode = OMAP_DSS_COLOR_ARGB16;
+               break;
+       case OMAPFB_COLOR_RGB24U:
+               mode = OMAP_DSS_COLOR_RGB24U;
+               break;
+       case OMAPFB_COLOR_RGB24P:
+               mode = OMAP_DSS_COLOR_RGB24P;
+               break;
+       case OMAPFB_COLOR_ARGB32:
+               mode = OMAP_DSS_COLOR_ARGB32;
+               break;
+       case OMAPFB_COLOR_RGBA32:
+               mode = OMAP_DSS_COLOR_RGBA32;
+               break;
+       case OMAPFB_COLOR_RGBX32:
+               mode = OMAP_DSS_COLOR_RGBX32;
+               break;
+       default:
+               mode = -EINVAL;
+       }
+
+       return mode;
+}
+
+static int omapfb_parse_vram_param(const char *param, int max_entries,
+               unsigned long *sizes, unsigned long *paddrs)
+{
+       int fbnum;
+       unsigned long size;
+       unsigned long paddr = 0;
+       char *p, *start;
+
+       start = (char *)param;
+
+       while (1) {
+               p = start;
+
+               fbnum = simple_strtoul(p, &p, 10);
+
+               if (p == param)
+                       return -EINVAL;
+
+               if (*p != ':')
+                       return -EINVAL;
+
+               if (fbnum >= max_entries)
+                       return -EINVAL;
+
+               size = memparse(p + 1, &p);
+
+               if (!size)
+                       return -EINVAL;
+
+               paddr = 0;
+
+               if (*p == '@') {
+                       paddr = simple_strtoul(p + 1, &p, 16);
+
+                       if (!paddr)
+                               return -EINVAL;
+
+               }
+
+               paddrs[fbnum] = paddr;
+               sizes[fbnum] = size;
+
+               if (*p == 0)
+                       break;
+
+               if (*p != ',')
+                       return -EINVAL;
+
+               ++p;
+
+               start = p;
+       }
+
+       return 0;
+}
+
+static int omapfb_allocate_all_fbs(struct omapfb2_device *fbdev)
+{
+       int i, r;
+       unsigned long vram_sizes[10];
+       unsigned long vram_paddrs[10];
+
+       memset(&vram_sizes, 0, sizeof(vram_sizes));
+       memset(&vram_paddrs, 0, sizeof(vram_paddrs));
+
+       if (def_vram && omapfb_parse_vram_param(def_vram, 10,
+                               vram_sizes, vram_paddrs)) {
+               dev_err(fbdev->dev, "failed to parse vram parameter\n");
+
+               memset(&vram_sizes, 0, sizeof(vram_sizes));
+               memset(&vram_paddrs, 0, sizeof(vram_paddrs));
+       }
+
+       if (fbdev->dev->platform_data) {
+               struct omapfb_platform_data *opd;
+               opd = fbdev->dev->platform_data;
+               for (i = 0; i < opd->mem_desc.region_cnt; ++i) {
+                       if (!vram_sizes[i]) {
+                               unsigned long size;
+                               unsigned long paddr;
+
+                               size = opd->mem_desc.region[i].size;
+                               paddr = opd->mem_desc.region[i].paddr;
+
+                               vram_sizes[i] = size;
+                               vram_paddrs[i] = paddr;
+                       }
+               }
+       }
+
+       for (i = 0; i < fbdev->num_fbs; i++) {
+               /* allocate memory automatically only for fb0, or if
+                * excplicitly defined with vram or plat data option */
+               if (i == 0 || vram_sizes[i] != 0) {
+                       r = omapfb_alloc_fbmem_display(fbdev->fbs[i],
+                                       vram_sizes[i], vram_paddrs[i]);
+
+                       if (r)
+                               return r;
+               }
+       }
+
+       for (i = 0; i < fbdev->num_fbs; i++) {
+               struct omapfb_info *ofbi = FB2OFB(fbdev->fbs[i]);
+               struct omapfb2_mem_region *rg;
+               rg = &ofbi->region;
+
+               DBG("region%d phys %08x virt %p size=%lu\n",
+                               i,
+                               rg->paddr,
+                               rg->vaddr,
+                               rg->size);
+       }
+
+       return 0;
+}
+
+int omapfb_realloc_fbmem(struct fb_info *fbi, unsigned long size, int type)
+{
+       struct omapfb_info *ofbi = FB2OFB(fbi);
+       struct omapfb2_device *fbdev = ofbi->fbdev;
+       struct omap_dss_device *display = fb2display(fbi);
+       struct omapfb2_mem_region *rg = &ofbi->region;
+       unsigned long old_size = rg->size;
+       unsigned long old_paddr = rg->paddr;
+       int old_type = rg->type;
+       int r;
+
+       if (type > OMAPFB_MEMTYPE_MAX)
+               return -EINVAL;
+
+       size = PAGE_ALIGN(size);
+
+       if (old_size == size && old_type == type)
+               return 0;
+
+       if (display && display->sync)
+                       display->sync(display);
+
+       omapfb_free_fbmem(fbi);
+
+       if (size == 0) {
+               clear_fb_info(fbi);
+               return 0;
+       }
+
+       r = omapfb_alloc_fbmem(fbi, size, 0);
+
+       if (r) {
+               if (old_size)
+                       omapfb_alloc_fbmem(fbi, old_size, old_paddr);
+
+               if (rg->size == 0)
+                       clear_fb_info(fbi);
+
+               return r;
+       }
+
+       if (old_size == size)
+               return 0;
+
+       if (old_size == 0) {
+               DBG("initializing fb %d\n", ofbi->id);
+               r = omapfb_fb_init(fbdev, fbi);
+               if (r) {
+                       DBG("omapfb_fb_init failed\n");
+                       goto err;
+               }
+               r = omapfb_apply_changes(fbi, 1);
+               if (r) {
+                       DBG("omapfb_apply_changes failed\n");
+                       goto err;
+               }
+       } else {
+               struct fb_var_screeninfo new_var;
+               memcpy(&new_var, &fbi->var, sizeof(new_var));
+               r = check_fb_var(fbi, &new_var);
+               if (r)
+                       goto err;
+               memcpy(&fbi->var, &new_var, sizeof(fbi->var));
+               set_fb_fix(fbi);
+               r = setup_vrfb_rotation(fbi);
+               if (r)
+                       goto err;
+       }
+
+       return 0;
+err:
+       omapfb_free_fbmem(fbi);
+       clear_fb_info(fbi);
+       return r;
+}
+
+/* initialize fb_info, var, fix to something sane based on the display */
+static int omapfb_fb_init(struct omapfb2_device *fbdev, struct fb_info *fbi)
+{
+       struct fb_var_screeninfo *var = &fbi->var;
+       struct omap_dss_device *display = fb2display(fbi);
+       struct omapfb_info *ofbi = FB2OFB(fbi);
+       int r = 0;
+
+       fbi->fbops = &omapfb_ops;
+       fbi->flags = FBINFO_FLAG_DEFAULT;
+       fbi->pseudo_palette = fbdev->pseudo_palette;
+
+       if (ofbi->region.size == 0) {
+               clear_fb_info(fbi);
+               return 0;
+       }
+
+       var->nonstd = 0;
+       var->bits_per_pixel = 0;
+
+       var->rotate = def_rotate;
+
+       /*
+        * Check if there is a default color format set in the board file,
+        * and use this format instead the default deducted from the
+        * display bpp.
+        */
+       if (fbdev->dev->platform_data) {
+               struct omapfb_platform_data *opd;
+               int id = ofbi->id;
+
+               opd = fbdev->dev->platform_data;
+               if (opd->mem_desc.region[id].format_used) {
+                       enum omap_color_mode mode;
+                       enum omapfb_color_format format;
+
+                       format = opd->mem_desc.region[id].format;
+                       mode = fb_format_to_dss_mode(format);
+                       if (mode < 0) {
+                               r = mode;
+                               goto err;
+                       }
+                       r = dss_mode_to_fb_mode(mode, var);
+                       if (r < 0)
+                               goto err;
+               }
+       }
+
+       if (display) {
+               u16 w, h;
+               int rotation = (var->rotate + ofbi->rotation[0]) % 4;
+
+               display->get_resolution(display, &w, &h);
+
+               if (rotation == FB_ROTATE_CW ||
+                               rotation == FB_ROTATE_CCW) {
+                       var->xres = h;
+                       var->yres = w;
+               } else {
+                       var->xres = w;
+                       var->yres = h;
+               }
+
+               var->xres_virtual = var->xres;
+               var->yres_virtual = var->yres;
+
+               if (!var->bits_per_pixel) {
+                       switch (display->get_recommended_bpp(display)) {
+                       case 16:
+                               var->bits_per_pixel = 16;
+                               break;
+                       case 24:
+                               var->bits_per_pixel = 32;
+                               break;
+                       default:
+                               dev_err(fbdev->dev, "illegal display "
+                                               "bpp\n");
+                               return -EINVAL;
+                       }
+               }
+       } else {
+               /* if there's no display, let's just guess some basic values */
+               var->xres = 320;
+               var->yres = 240;
+               var->xres_virtual = var->xres;
+               var->yres_virtual = var->yres;
+               if (!var->bits_per_pixel)
+                       var->bits_per_pixel = 16;
+       }
+
+       r = check_fb_var(fbi, var);
+       if (r)
+               goto err;
+
+       set_fb_fix(fbi);
+       r = setup_vrfb_rotation(fbi);
+       if (r)
+               goto err;
+
+       r = fb_alloc_cmap(&fbi->cmap, 256, 0);
+       if (r)
+               dev_err(fbdev->dev, "unable to allocate color map memory\n");
+
+err:
+       return r;
+}
+
+static void fbinfo_cleanup(struct omapfb2_device *fbdev, struct fb_info *fbi)
+{
+       fb_dealloc_cmap(&fbi->cmap);
+}
+
+
+static void omapfb_free_resources(struct omapfb2_device *fbdev)
+{
+       int i;
+
+       DBG("free_resources\n");
+
+       if (fbdev == NULL)
+               return;
+
+       for (i = 0; i < fbdev->num_fbs; i++)
+               unregister_framebuffer(fbdev->fbs[i]);
+
+       /* free the reserved fbmem */
+       omapfb_free_all_fbmem(fbdev);
+
+       for (i = 0; i < fbdev->num_fbs; i++) {
+               fbinfo_cleanup(fbdev, fbdev->fbs[i]);
+               framebuffer_release(fbdev->fbs[i]);
+       }
+
+       for (i = 0; i < fbdev->num_displays; i++) {
+               if (fbdev->displays[i]->state != OMAP_DSS_DISPLAY_DISABLED)
+                       fbdev->displays[i]->disable(fbdev->displays[i]);
+
+               omap_dss_put_device(fbdev->displays[i]);
+       }
+
+       dev_set_drvdata(fbdev->dev, NULL);
+       kfree(fbdev);
+}
+
+static int omapfb_create_framebuffers(struct omapfb2_device *fbdev)
+{
+       int r, i;
+
+       fbdev->num_fbs = 0;
+
+       DBG("create %d framebuffers\n", CONFIG_FB_OMAP2_NUM_FBS);
+
+       /* allocate fb_infos */
+       for (i = 0; i < CONFIG_FB_OMAP2_NUM_FBS; i++) {
+               struct fb_info *fbi;
+               struct omapfb_info *ofbi;
+
+               fbi = framebuffer_alloc(sizeof(struct omapfb_info),
+                               fbdev->dev);
+
+               if (fbi == NULL) {
+                       dev_err(fbdev->dev,
+                               "unable to allocate memory for plane info\n");
+                       return -ENOMEM;
+               }
+
+               clear_fb_info(fbi);
+
+               fbdev->fbs[i] = fbi;
+
+               ofbi = FB2OFB(fbi);
+               ofbi->fbdev = fbdev;
+               ofbi->id = i;
+
+               /* assign these early, so that fb alloc can use them */
+               ofbi->rotation_type = def_vrfb ? OMAP_DSS_ROT_VRFB :
+                       OMAP_DSS_ROT_DMA;
+               ofbi->mirror = def_mirror;
+
+               fbdev->num_fbs++;
+       }
+
+       DBG("fb_infos allocated\n");
+
+       /* assign overlays for the fbs */
+       for (i = 0; i < min(fbdev->num_fbs, fbdev->num_overlays); i++) {
+               struct omapfb_info *ofbi = FB2OFB(fbdev->fbs[i]);
+
+               ofbi->overlays[0] = fbdev->overlays[i];
+               ofbi->num_overlays = 1;
+       }
+
+       /* allocate fb memories */
+       r = omapfb_allocate_all_fbs(fbdev);
+       if (r) {
+               dev_err(fbdev->dev, "failed to allocate fbmem\n");
+               return r;
+       }
+
+       DBG("fbmems allocated\n");
+
+       /* setup fb_infos */
+       for (i = 0; i < fbdev->num_fbs; i++) {
+               r = omapfb_fb_init(fbdev, fbdev->fbs[i]);
+               if (r) {
+                       dev_err(fbdev->dev, "failed to setup fb_info\n");
+                       return r;
+               }
+       }
+
+       DBG("fb_infos initialized\n");
+
+       for (i = 0; i < fbdev->num_fbs; i++) {
+               r = register_framebuffer(fbdev->fbs[i]);
+               if (r != 0) {
+                       dev_err(fbdev->dev,
+                               "registering framebuffer %d failed\n", i);
+                       return r;
+               }
+       }
+
+       DBG("framebuffers registered\n");
+
+       for (i = 0; i < fbdev->num_fbs; i++) {
+               r = omapfb_apply_changes(fbdev->fbs[i], 1);
+               if (r) {
+                       dev_err(fbdev->dev, "failed to change mode\n");
+                       return r;
+               }
+       }
+
+       DBG("create sysfs for fbs\n");
+       r = omapfb_create_sysfs(fbdev);
+       if (r) {
+               dev_err(fbdev->dev, "failed to create sysfs entries\n");
+               return r;
+       }
+
+       /* Enable fb0 */
+       if (fbdev->num_fbs > 0) {
+               struct omapfb_info *ofbi = FB2OFB(fbdev->fbs[0]);
+
+               if (ofbi->num_overlays > 0) {
+                       struct omap_overlay *ovl = ofbi->overlays[0];
+
+                       r = omapfb_overlay_enable(ovl, 1);
+
+                       if (r) {
+                               dev_err(fbdev->dev,
+                                               "failed to enable overlay\n");
+                               return r;
+                       }
+               }
+       }
+
+       DBG("create_framebuffers done\n");
+
+       return 0;
+}
+
+static int omapfb_mode_to_timings(const char *mode_str,
+               struct omap_video_timings *timings, u8 *bpp)
+{
+       struct fb_info fbi;
+       struct fb_var_screeninfo var;
+       struct fb_ops fbops;
+       int r;
+
+#ifdef CONFIG_OMAP2_DSS_VENC
+       if (strcmp(mode_str, "pal") == 0) {
+               *timings = omap_dss_pal_timings;
+               *bpp = 0;
+               return 0;
+       } else if (strcmp(mode_str, "ntsc") == 0) {
+               *timings = omap_dss_ntsc_timings;
+               *bpp = 0;
+               return 0;
+       }
+#endif
+
+       /* this is quite a hack, but I wanted to use the modedb and for
+        * that we need fb_info and var, so we create dummy ones */
+
+       memset(&fbi, 0, sizeof(fbi));
+       memset(&var, 0, sizeof(var));
+       memset(&fbops, 0, sizeof(fbops));
+       fbi.fbops = &fbops;
+
+       r = fb_find_mode(&var, &fbi, mode_str, NULL, 0, NULL, 24);
+
+       if (r != 0) {
+               timings->pixel_clock = PICOS2KHZ(var.pixclock);
+               timings->hfp = var.left_margin;
+               timings->hbp = var.right_margin;
+               timings->vfp = var.upper_margin;
+               timings->vbp = var.lower_margin;
+               timings->hsw = var.hsync_len;
+               timings->vsw = var.vsync_len;
+               timings->x_res = var.xres;
+               timings->y_res = var.yres;
+
+               switch (var.bits_per_pixel) {
+               case 16:
+                       *bpp = 16;
+                       break;
+               case 24:
+               case 32:
+               default:
+                       *bpp = 24;
+                       break;
+               }
+
+               return 0;
+       } else {
+               return -EINVAL;
+       }
+}
+
+static int omapfb_set_def_mode(struct omap_dss_device *display, char *mode_str)
+{
+       int r;
+       u8 bpp;
+       struct omap_video_timings timings;
+
+       r = omapfb_mode_to_timings(mode_str, &timings, &bpp);
+       if (r)
+               return r;
+
+       display->panel.recommended_bpp = bpp;
+
+       if (!display->check_timings || !display->set_timings)
+               return -EINVAL;
+
+       r = display->check_timings(display, &timings);
+       if (r)
+               return r;
+
+       display->set_timings(display, &timings);
+
+       return 0;
+}
+
+static int omapfb_parse_def_modes(struct omapfb2_device *fbdev)
+{
+       char *str, *options, *this_opt;
+       int r = 0;
+
+       str = kmalloc(strlen(def_mode) + 1, GFP_KERNEL);
+       strcpy(str, def_mode);
+       options = str;
+
+       while (!r && (this_opt = strsep(&options, ",")) != NULL) {
+               char *p, *display_str, *mode_str;
+               struct omap_dss_device *display;
+               int i;
+
+               p = strchr(this_opt, ':');
+               if (!p) {
+                       r = -EINVAL;
+                       break;
+               }
+
+               *p = 0;
+               display_str = this_opt;
+               mode_str = p + 1;
+
+               display = NULL;
+               for (i = 0; i < fbdev->num_displays; ++i) {
+                       if (strcmp(fbdev->displays[i]->name,
+                                               display_str) == 0) {
+                               display = fbdev->displays[i];
+                               break;
+                       }
+               }
+
+               if (!display) {
+                       r = -EINVAL;
+                       break;
+               }
+
+               r = omapfb_set_def_mode(display, mode_str);
+               if (r)
+                       break;
+       }
+
+       kfree(str);
+
+       return r;
+}
+
+static int omapfb_probe(struct platform_device *pdev)
+{
+       struct omapfb2_device *fbdev = NULL;
+       int r = 0;
+       int i;
+       struct omap_overlay *ovl;
+       struct omap_dss_device *def_display;
+       struct omap_dss_device *dssdev;
+
+       DBG("omapfb_probe\n");
+
+       if (pdev->num_resources != 0) {
+               dev_err(&pdev->dev, "probed for an unknown device\n");
+               r = -ENODEV;
+               goto err0;
+       }
+
+       fbdev = kzalloc(sizeof(struct omapfb2_device), GFP_KERNEL);
+       if (fbdev == NULL) {
+               r = -ENOMEM;
+               goto err0;
+       }
+
+       mutex_init(&fbdev->mtx);
+
+       fbdev->dev = &pdev->dev;
+       platform_set_drvdata(pdev, fbdev);
+
+       fbdev->num_displays = 0;
+       dssdev = NULL;
+       for_each_dss_dev(dssdev) {
+               omap_dss_get_device(dssdev);
+               fbdev->displays[fbdev->num_displays++] = dssdev;
+       }
+
+       if (fbdev->num_displays == 0) {
+               dev_err(&pdev->dev, "no displays\n");
+               r = -EINVAL;
+               goto cleanup;
+       }
+
+       fbdev->num_overlays = omap_dss_get_num_overlays();
+       for (i = 0; i < fbdev->num_overlays; i++)
+               fbdev->overlays[i] = omap_dss_get_overlay(i);
+
+       fbdev->num_managers = omap_dss_get_num_overlay_managers();
+       for (i = 0; i < fbdev->num_managers; i++)
+               fbdev->managers[i] = omap_dss_get_overlay_manager(i);
+
+       if (def_mode && strlen(def_mode) > 0) {
+               if (omapfb_parse_def_modes(fbdev))
+                       dev_warn(&pdev->dev, "cannot parse default modes\n");
+       }
+
+       r = omapfb_create_framebuffers(fbdev);
+       if (r)
+               goto cleanup;
+
+       for (i = 0; i < fbdev->num_managers; i++) {
+               struct omap_overlay_manager *mgr;
+               mgr = fbdev->managers[i];
+               r = mgr->apply(mgr);
+               if (r)
+                       dev_warn(fbdev->dev, "failed to apply dispc config\n");
+       }
+
+       DBG("mgr->apply'ed\n");
+
+       /* gfx overlay should be the default one. find a display
+        * connected to that, and use it as default display */
+       ovl = omap_dss_get_overlay(0);
+       if (ovl->manager && ovl->manager->device) {
+               def_display = ovl->manager->device;
+       } else {
+               dev_warn(&pdev->dev, "cannot find default display\n");
+               def_display = NULL;
+       }
+
+       if (def_display) {
+#ifndef CONFIG_FB_OMAP2_FORCE_AUTO_UPDATE
+               u16 w, h;
+#endif
+               r = def_display->enable(def_display);
+               if (r)
+                       dev_warn(fbdev->dev, "Failed to enable display '%s'\n",
+                                       def_display->name);
+
+               /* set the update mode */
+               if (def_display->caps & OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE) {
+#ifdef CONFIG_FB_OMAP2_FORCE_AUTO_UPDATE
+                       if (def_display->enable_te)
+                               def_display->enable_te(def_display, 1);
+                       if (def_display->set_update_mode)
+                               def_display->set_update_mode(def_display,
+                                               OMAP_DSS_UPDATE_AUTO);
+#else /* MANUAL_UPDATE */
+                       if (def_display->enable_te)
+                               def_display->enable_te(def_display, 0);
+                       if (def_display->set_update_mode)
+                               def_display->set_update_mode(def_display,
+                                               OMAP_DSS_UPDATE_MANUAL);
+
+                       def_display->get_resolution(def_display, &w, &h);
+                       def_display->update(def_display, 0, 0, w, h);
+#endif
+               } else {
+                       if (def_display->set_update_mode)
+                               def_display->set_update_mode(def_display,
+                                               OMAP_DSS_UPDATE_AUTO);
+               }
+       }
+
+       return 0;
+
+cleanup:
+       omapfb_free_resources(fbdev);
+err0:
+       dev_err(&pdev->dev, "failed to setup omapfb\n");
+       return r;
+}
+
+static int omapfb_remove(struct platform_device *pdev)
+{
+       struct omapfb2_device *fbdev = platform_get_drvdata(pdev);
+
+       /* FIXME: wait till completion of pending events */
+
+       omapfb_remove_sysfs(fbdev);
+
+       omapfb_free_resources(fbdev);
+
+       return 0;
+}
+
+static struct platform_driver omapfb_driver = {
+       .probe          = omapfb_probe,
+       .remove         = omapfb_remove,
+       .driver         = {
+               .name   = "omapfb",
+               .owner  = THIS_MODULE,
+       },
+};
+
+static int __init omapfb_init(void)
+{
+       DBG("omapfb_init\n");
+
+       if (platform_driver_register(&omapfb_driver)) {
+               printk(KERN_ERR "failed to register omapfb driver\n");
+               return -ENODEV;
+       }
+
+       return 0;
+}
+
+static void __exit omapfb_exit(void)
+{
+       DBG("omapfb_exit\n");
+       platform_driver_unregister(&omapfb_driver);
+}
+
+module_param_named(mode, def_mode, charp, 0);
+module_param_named(vram, def_vram, charp, 0);
+module_param_named(rotate, def_rotate, int, 0);
+module_param_named(vrfb, def_vrfb, bool, 0);
+module_param_named(mirror, def_mirror, bool, 0);
+
+/* late_initcall to let panel/ctrl drivers loaded first.
+ * I guess better option would be a more dynamic approach,
+ * so that omapfb reacts to new panels when they are loaded */
+late_initcall(omapfb_init);
+/*module_init(omapfb_init);*/
+module_exit(omapfb_exit);
+
+MODULE_AUTHOR("Tomi Valkeinen <tomi.valkeinen@nokia.com>");
+MODULE_DESCRIPTION("OMAP2/3 Framebuffer");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/video/omap2/omapfb/omapfb-sysfs.c b/drivers/video/omap2/omapfb/omapfb-sysfs.c
new file mode 100644 (file)
index 0000000..62bb88f
--- /dev/null
@@ -0,0 +1,507 @@
+/*
+ * linux/drivers/video/omap2/omapfb-sysfs.c
+ *
+ * Copyright (C) 2008 Nokia Corporation
+ * Author: Tomi Valkeinen <tomi.valkeinen@nokia.com>
+ *
+ * Some code and ideas taken from drivers/video/omap/ driver
+ * by Imre Deak.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <linux/fb.h>
+#include <linux/sysfs.h>
+#include <linux/device.h>
+#include <linux/uaccess.h>
+#include <linux/platform_device.h>
+#include <linux/kernel.h>
+#include <linux/mm.h>
+#include <linux/omapfb.h>
+
+#include <plat/display.h>
+#include <plat/vrfb.h>
+
+#include "omapfb.h"
+
+static ssize_t show_rotate_type(struct device *dev,
+               struct device_attribute *attr, char *buf)
+{
+       struct fb_info *fbi = dev_get_drvdata(dev);
+       struct omapfb_info *ofbi = FB2OFB(fbi);
+
+       return snprintf(buf, PAGE_SIZE, "%d\n", ofbi->rotation_type);
+}
+
+static ssize_t store_rotate_type(struct device *dev,
+               struct device_attribute *attr,
+               const char *buf, size_t count)
+{
+       struct fb_info *fbi = dev_get_drvdata(dev);
+       struct omapfb_info *ofbi = FB2OFB(fbi);
+       enum omap_dss_rotation_type rot_type;
+       int r;
+
+       rot_type = simple_strtoul(buf, NULL, 0);
+
+       if (rot_type != OMAP_DSS_ROT_DMA && rot_type != OMAP_DSS_ROT_VRFB)
+               return -EINVAL;
+
+       lock_fb_info(fbi);
+
+       r = 0;
+       if (rot_type == ofbi->rotation_type)
+               goto out;
+
+       if (ofbi->region.size) {
+               r = -EBUSY;
+               goto out;
+       }
+
+       ofbi->rotation_type = rot_type;
+
+       /*
+        * Since the VRAM for this FB is not allocated at the moment we don't
+        * need to do any further parameter checking at this point.
+        */
+out:
+       unlock_fb_info(fbi);
+
+       return r ? r : count;
+}
+
+
+static ssize_t show_mirror(struct device *dev,
+               struct device_attribute *attr, char *buf)
+{
+       struct fb_info *fbi = dev_get_drvdata(dev);
+       struct omapfb_info *ofbi = FB2OFB(fbi);
+
+       return snprintf(buf, PAGE_SIZE, "%d\n", ofbi->mirror);
+}
+
+static ssize_t store_mirror(struct device *dev,
+               struct device_attribute *attr,
+               const char *buf, size_t count)
+{
+       struct fb_info *fbi = dev_get_drvdata(dev);
+       struct omapfb_info *ofbi = FB2OFB(fbi);
+       bool mirror;
+       int r;
+       struct fb_var_screeninfo new_var;
+
+       mirror = simple_strtoul(buf, NULL, 0);
+
+       if (mirror != 0 && mirror != 1)
+               return -EINVAL;
+
+       lock_fb_info(fbi);
+
+       ofbi->mirror = mirror;
+
+       memcpy(&new_var, &fbi->var, sizeof(new_var));
+       r = check_fb_var(fbi, &new_var);
+       if (r)
+               goto out;
+       memcpy(&fbi->var, &new_var, sizeof(fbi->var));
+
+       set_fb_fix(fbi);
+
+       r = omapfb_apply_changes(fbi, 0);
+       if (r)
+               goto out;
+
+       r = count;
+out:
+       unlock_fb_info(fbi);
+
+       return r;
+}
+
+static ssize_t show_overlays(struct device *dev,
+               struct device_attribute *attr, char *buf)
+{
+       struct fb_info *fbi = dev_get_drvdata(dev);
+       struct omapfb_info *ofbi = FB2OFB(fbi);
+       struct omapfb2_device *fbdev = ofbi->fbdev;
+       ssize_t l = 0;
+       int t;
+
+       omapfb_lock(fbdev);
+       lock_fb_info(fbi);
+
+       for (t = 0; t < ofbi->num_overlays; t++) {
+               struct omap_overlay *ovl = ofbi->overlays[t];
+               int ovlnum;
+
+               for (ovlnum = 0; ovlnum < fbdev->num_overlays; ++ovlnum)
+                       if (ovl == fbdev->overlays[ovlnum])
+                               break;
+
+               l += snprintf(buf + l, PAGE_SIZE - l, "%s%d",
+                               t == 0 ? "" : ",", ovlnum);
+       }
+
+       l += snprintf(buf + l, PAGE_SIZE - l, "\n");
+
+       unlock_fb_info(fbi);
+       omapfb_unlock(fbdev);
+
+       return l;
+}
+
+static struct omapfb_info *get_overlay_fb(struct omapfb2_device *fbdev,
+               struct omap_overlay *ovl)
+{
+       int i, t;
+
+       for (i = 0; i < fbdev->num_fbs; i++) {
+               struct omapfb_info *ofbi = FB2OFB(fbdev->fbs[i]);
+
+               for (t = 0; t < ofbi->num_overlays; t++) {
+                       if (ofbi->overlays[t] == ovl)
+                               return ofbi;
+               }
+       }
+
+       return NULL;
+}
+
+static ssize_t store_overlays(struct device *dev, struct device_attribute *attr,
+               const char *buf, size_t count)
+{
+       struct fb_info *fbi = dev_get_drvdata(dev);
+       struct omapfb_info *ofbi = FB2OFB(fbi);
+       struct omapfb2_device *fbdev = ofbi->fbdev;
+       struct omap_overlay *ovls[OMAPFB_MAX_OVL_PER_FB];
+       struct omap_overlay *ovl;
+       int num_ovls, r, i;
+       int len;
+       bool added = false;
+
+       num_ovls = 0;
+
+       len = strlen(buf);
+       if (buf[len - 1] == '\n')
+               len = len - 1;
+
+       omapfb_lock(fbdev);
+       lock_fb_info(fbi);
+
+       if (len > 0) {
+               char *p = (char *)buf;
+               int ovlnum;
+
+               while (p < buf + len) {
+                       int found;
+                       if (num_ovls == OMAPFB_MAX_OVL_PER_FB) {
+                               r = -EINVAL;
+                               goto out;
+                       }
+
+                       ovlnum = simple_strtoul(p, &p, 0);
+                       if (ovlnum > fbdev->num_overlays) {
+                               r = -EINVAL;
+                               goto out;
+                       }
+
+                       found = 0;
+                       for (i = 0; i < num_ovls; ++i) {
+                               if (ovls[i] == fbdev->overlays[ovlnum]) {
+                                       found = 1;
+                                       break;
+                               }
+                       }
+
+                       if (!found)
+                               ovls[num_ovls++] = fbdev->overlays[ovlnum];
+
+                       p++;
+               }
+       }
+
+       for (i = 0; i < num_ovls; ++i) {
+               struct omapfb_info *ofbi2 = get_overlay_fb(fbdev, ovls[i]);
+               if (ofbi2 && ofbi2 != ofbi) {
+                       dev_err(fbdev->dev, "overlay already in use\n");
+                       r = -EINVAL;
+                       goto out;
+               }
+       }
+
+       /* detach unused overlays */
+       for (i = 0; i < ofbi->num_overlays; ++i) {
+               int t, found;
+
+               ovl = ofbi->overlays[i];
+
+               found = 0;
+
+               for (t = 0; t < num_ovls; ++t) {
+                       if (ovl == ovls[t]) {
+                               found = 1;
+                               break;
+                       }
+               }
+
+               if (found)
+                       continue;
+
+               DBG("detaching %d\n", ofbi->overlays[i]->id);
+
+               omapfb_overlay_enable(ovl, 0);
+
+               if (ovl->manager)
+                       ovl->manager->apply(ovl->manager);
+
+               for (t = i + 1; t < ofbi->num_overlays; t++) {
+                       ofbi->rotation[t-1] = ofbi->rotation[t];
+                       ofbi->overlays[t-1] = ofbi->overlays[t];
+               }
+
+               ofbi->num_overlays--;
+               i--;
+       }
+
+       for (i = 0; i < num_ovls; ++i) {
+               int t, found;
+
+               ovl = ovls[i];
+
+               found = 0;
+
+               for (t = 0; t < ofbi->num_overlays; ++t) {
+                       if (ovl == ofbi->overlays[t]) {
+                               found = 1;
+                               break;
+                       }
+               }
+
+               if (found)
+                       continue;
+               ofbi->rotation[ofbi->num_overlays] = 0;
+               ofbi->overlays[ofbi->num_overlays++] = ovl;
+
+               added = true;
+       }
+
+       if (added) {
+               r = omapfb_apply_changes(fbi, 0);
+               if (r)
+                       goto out;
+       }
+
+       r = count;
+out:
+       unlock_fb_info(fbi);
+       omapfb_unlock(fbdev);
+
+       return r;
+}
+
+static ssize_t show_overlays_rotate(struct device *dev,
+               struct device_attribute *attr, char *buf)
+{
+       struct fb_info *fbi = dev_get_drvdata(dev);
+       struct omapfb_info *ofbi = FB2OFB(fbi);
+       ssize_t l = 0;
+       int t;
+
+       lock_fb_info(fbi);
+
+       for (t = 0; t < ofbi->num_overlays; t++) {
+               l += snprintf(buf + l, PAGE_SIZE - l, "%s%d",
+                               t == 0 ? "" : ",", ofbi->rotation[t]);
+       }
+
+       l += snprintf(buf + l, PAGE_SIZE - l, "\n");
+
+       unlock_fb_info(fbi);
+
+       return l;
+}
+
+static ssize_t store_overlays_rotate(struct device *dev,
+               struct device_attribute *attr, const char *buf, size_t count)
+{
+       struct fb_info *fbi = dev_get_drvdata(dev);
+       struct omapfb_info *ofbi = FB2OFB(fbi);
+       int num_ovls = 0, r, i;
+       int len;
+       bool changed = false;
+       u8 rotation[OMAPFB_MAX_OVL_PER_FB];
+
+       len = strlen(buf);
+       if (buf[len - 1] == '\n')
+               len = len - 1;
+
+       lock_fb_info(fbi);
+
+       if (len > 0) {
+               char *p = (char *)buf;
+
+               while (p < buf + len) {
+                       int rot;
+
+                       if (num_ovls == ofbi->num_overlays) {
+                               r = -EINVAL;
+                               goto out;
+                       }
+
+                       rot = simple_strtoul(p, &p, 0);
+                       if (rot < 0 || rot > 3) {
+                               r = -EINVAL;
+                               goto out;
+                       }
+
+                       if (ofbi->rotation[num_ovls] != rot)
+                               changed = true;
+
+                       rotation[num_ovls++] = rot;
+
+                       p++;
+               }
+       }
+
+       if (num_ovls != ofbi->num_overlays) {
+               r = -EINVAL;
+               goto out;
+       }
+
+       if (changed) {
+               for (i = 0; i < num_ovls; ++i)
+                       ofbi->rotation[i] = rotation[i];
+
+               r = omapfb_apply_changes(fbi, 0);
+               if (r)
+                       goto out;
+
+               /* FIXME error handling? */
+       }
+
+       r = count;
+out:
+       unlock_fb_info(fbi);
+
+       return r;
+}
+
+static ssize_t show_size(struct device *dev,
+               struct device_attribute *attr, char *buf)
+{
+       struct fb_info *fbi = dev_get_drvdata(dev);
+       struct omapfb_info *ofbi = FB2OFB(fbi);
+
+       return snprintf(buf, PAGE_SIZE, "%lu\n", ofbi->region.size);
+}
+
+static ssize_t store_size(struct device *dev, struct device_attribute *attr,
+               const char *buf, size_t count)
+{
+       struct fb_info *fbi = dev_get_drvdata(dev);
+       struct omapfb_info *ofbi = FB2OFB(fbi);
+       unsigned long size;
+       int r;
+       int i;
+
+       size = PAGE_ALIGN(simple_strtoul(buf, NULL, 0));
+
+       lock_fb_info(fbi);
+
+       for (i = 0; i < ofbi->num_overlays; i++) {
+               if (ofbi->overlays[i]->info.enabled) {
+                       r = -EBUSY;
+                       goto out;
+               }
+       }
+
+       if (size != ofbi->region.size) {
+               r = omapfb_realloc_fbmem(fbi, size, ofbi->region.type);
+               if (r) {
+                       dev_err(dev, "realloc fbmem failed\n");
+                       goto out;
+               }
+       }
+
+       r = count;
+out:
+       unlock_fb_info(fbi);
+
+       return r;
+}
+
+static ssize_t show_phys(struct device *dev,
+               struct device_attribute *attr, char *buf)
+{
+       struct fb_info *fbi = dev_get_drvdata(dev);
+       struct omapfb_info *ofbi = FB2OFB(fbi);
+
+       return snprintf(buf, PAGE_SIZE, "%0x\n", ofbi->region.paddr);
+}
+
+static ssize_t show_virt(struct device *dev,
+               struct device_attribute *attr, char *buf)
+{
+       struct fb_info *fbi = dev_get_drvdata(dev);
+       struct omapfb_info *ofbi = FB2OFB(fbi);
+
+       return snprintf(buf, PAGE_SIZE, "%p\n", ofbi->region.vaddr);
+}
+
+static struct device_attribute omapfb_attrs[] = {
+       __ATTR(rotate_type, S_IRUGO | S_IWUSR, show_rotate_type,
+                       store_rotate_type),
+       __ATTR(mirror, S_IRUGO | S_IWUSR, show_mirror, store_mirror),
+       __ATTR(size, S_IRUGO | S_IWUSR, show_size, store_size),
+       __ATTR(overlays, S_IRUGO | S_IWUSR, show_overlays, store_overlays),
+       __ATTR(overlays_rotate, S_IRUGO | S_IWUSR, show_overlays_rotate,
+                       store_overlays_rotate),
+       __ATTR(phys_addr, S_IRUGO, show_phys, NULL),
+       __ATTR(virt_addr, S_IRUGO, show_virt, NULL),
+};
+
+int omapfb_create_sysfs(struct omapfb2_device *fbdev)
+{
+       int i;
+       int r;
+
+       DBG("create sysfs for fbs\n");
+       for (i = 0; i < fbdev->num_fbs; i++) {
+               int t;
+               for (t = 0; t < ARRAY_SIZE(omapfb_attrs); t++) {
+                       r = device_create_file(fbdev->fbs[i]->dev,
+                                       &omapfb_attrs[t]);
+
+                       if (r) {
+                               dev_err(fbdev->dev, "failed to create sysfs "
+                                               "file\n");
+                               return r;
+                       }
+               }
+       }
+
+       return 0;
+}
+
+void omapfb_remove_sysfs(struct omapfb2_device *fbdev)
+{
+       int i, t;
+
+       DBG("remove sysfs for fbs\n");
+       for (i = 0; i < fbdev->num_fbs; i++) {
+               for (t = 0; t < ARRAY_SIZE(omapfb_attrs); t++)
+                       device_remove_file(fbdev->fbs[i]->dev,
+                                       &omapfb_attrs[t]);
+       }
+}
+
diff --git a/drivers/video/omap2/omapfb/omapfb.h b/drivers/video/omap2/omapfb/omapfb.h
new file mode 100644 (file)
index 0000000..f7c9c73
--- /dev/null
@@ -0,0 +1,146 @@
+/*
+ * linux/drivers/video/omap2/omapfb.h
+ *
+ * Copyright (C) 2008 Nokia Corporation
+ * Author: Tomi Valkeinen <tomi.valkeinen@nokia.com>
+ *
+ * Some code and ideas taken from drivers/video/omap/ driver
+ * by Imre Deak.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __DRIVERS_VIDEO_OMAP2_OMAPFB_H__
+#define __DRIVERS_VIDEO_OMAP2_OMAPFB_H__
+
+#ifdef CONFIG_FB_OMAP2_DEBUG_SUPPORT
+#define DEBUG
+#endif
+
+#include <plat/display.h>
+
+#ifdef DEBUG
+extern unsigned int omapfb_debug;
+#define DBG(format, ...) \
+       if (omapfb_debug) \
+               printk(KERN_DEBUG "OMAPFB: " format, ## __VA_ARGS__)
+#else
+#define DBG(format, ...)
+#endif
+
+#define FB2OFB(fb_info) ((struct omapfb_info *)(fb_info->par))
+
+/* max number of overlays to which a framebuffer data can be direct */
+#define OMAPFB_MAX_OVL_PER_FB 3
+
+struct omapfb2_mem_region {
+       u32             paddr;
+       void __iomem    *vaddr;
+       struct vrfb     vrfb;
+       unsigned long   size;
+       u8              type;           /* OMAPFB_PLANE_MEM_* */
+       bool            alloc;          /* allocated by the driver */
+       bool            map;            /* kernel mapped by the driver */
+};
+
+/* appended to fb_info */
+struct omapfb_info {
+       int id;
+       struct omapfb2_mem_region region;
+       atomic_t map_count;
+       int num_overlays;
+       struct omap_overlay *overlays[OMAPFB_MAX_OVL_PER_FB];
+       struct omapfb2_device *fbdev;
+       enum omap_dss_rotation_type rotation_type;
+       u8 rotation[OMAPFB_MAX_OVL_PER_FB];
+       bool mirror;
+};
+
+struct omapfb2_device {
+       struct device *dev;
+       struct mutex  mtx;
+
+       u32 pseudo_palette[17];
+
+       int state;
+
+       unsigned num_fbs;
+       struct fb_info *fbs[10];
+
+       unsigned num_displays;
+       struct omap_dss_device *displays[10];
+       unsigned num_overlays;
+       struct omap_overlay *overlays[10];
+       unsigned num_managers;
+       struct omap_overlay_manager *managers[10];
+};
+
+struct omapfb_colormode {
+       enum omap_color_mode dssmode;
+       u32 bits_per_pixel;
+       u32 nonstd;
+       struct fb_bitfield red;
+       struct fb_bitfield green;
+       struct fb_bitfield blue;
+       struct fb_bitfield transp;
+};
+
+void set_fb_fix(struct fb_info *fbi);
+int check_fb_var(struct fb_info *fbi, struct fb_var_screeninfo *var);
+int omapfb_realloc_fbmem(struct fb_info *fbi, unsigned long size, int type);
+int omapfb_apply_changes(struct fb_info *fbi, int init);
+
+int omapfb_create_sysfs(struct omapfb2_device *fbdev);
+void omapfb_remove_sysfs(struct omapfb2_device *fbdev);
+
+int omapfb_ioctl(struct fb_info *fbi, unsigned int cmd, unsigned long arg);
+
+int dss_mode_to_fb_mode(enum omap_color_mode dssmode,
+                       struct fb_var_screeninfo *var);
+
+/* find the display connected to this fb, if any */
+static inline struct omap_dss_device *fb2display(struct fb_info *fbi)
+{
+       struct omapfb_info *ofbi = FB2OFB(fbi);
+       int i;
+
+       /* XXX: returns the display connected to first attached overlay */
+       for (i = 0; i < ofbi->num_overlays; i++) {
+               if (ofbi->overlays[i]->manager)
+                       return ofbi->overlays[i]->manager->device;
+       }
+
+       return NULL;
+}
+
+static inline void omapfb_lock(struct omapfb2_device *fbdev)
+{
+       mutex_lock(&fbdev->mtx);
+}
+
+static inline void omapfb_unlock(struct omapfb2_device *fbdev)
+{
+       mutex_unlock(&fbdev->mtx);
+}
+
+static inline int omapfb_overlay_enable(struct omap_overlay *ovl,
+               int enable)
+{
+       struct omap_overlay_info info;
+
+       ovl->get_overlay_info(ovl, &info);
+       info.enabled = enable;
+       return ovl->set_overlay_info(ovl, &info);
+}
+
+#endif
index a8efa92c6c35d129b668dafd1dc71fda6f512e44..f46c40ac6d45a6007e573ee6f30e2c99ee098b06 100644 (file)
@@ -24,6 +24,7 @@
 #ifndef __LINUX_OMAPFB_H__
 #define __LINUX_OMAPFB_H__
 
+#include <linux/fb.h>
 #include <linux/ioctl.h>
 #include <linux/types.h>
 
 #define OMAPFB_UPDATE_WINDOW   OMAP_IOW(54, struct omapfb_update_window)
 #define OMAPFB_SETUP_MEM       OMAP_IOW(55, struct omapfb_mem_info)
 #define OMAPFB_QUERY_MEM       OMAP_IOW(56, struct omapfb_mem_info)
+#define OMAPFB_WAITFORVSYNC    OMAP_IO(57)
+#define OMAPFB_MEMORY_READ     OMAP_IOR(58, struct omapfb_memory_read)
+#define OMAPFB_GET_OVERLAY_COLORMODE OMAP_IOR(59, struct omapfb_ovl_colormode)
+#define OMAPFB_WAITFORGO       OMAP_IO(60)
+#define OMAPFB_GET_VRAM_INFO   OMAP_IOR(61, struct omapfb_vram_info)
+#define OMAPFB_SET_TEARSYNC    OMAP_IOW(62, struct omapfb_tearsync_info)
 
 #define OMAPFB_CAPS_GENERIC_MASK       0x00000fff
 #define OMAPFB_CAPS_LCDC_MASK          0x00fff000
@@ -87,6 +94,13 @@ enum omapfb_color_format {
        OMAPFB_COLOR_CLUT_1BPP,
        OMAPFB_COLOR_RGB444,
        OMAPFB_COLOR_YUY422,
+
+       OMAPFB_COLOR_ARGB16,
+       OMAPFB_COLOR_RGB24U,    /* RGB24, 32-bit container */
+       OMAPFB_COLOR_RGB24P,    /* RGB24, 24-bit container */
+       OMAPFB_COLOR_ARGB32,
+       OMAPFB_COLOR_RGBA32,
+       OMAPFB_COLOR_RGBX32,
 };
 
 struct omapfb_update_window {
@@ -158,6 +172,40 @@ enum omapfb_update_mode {
        OMAPFB_MANUAL_UPDATE
 };
 
+struct omapfb_memory_read {
+       __u16 x;
+       __u16 y;
+       __u16 w;
+       __u16 h;
+       size_t buffer_size;
+       void __user *buffer;
+};
+
+struct omapfb_ovl_colormode {
+       __u8 overlay_idx;
+       __u8 mode_idx;
+       __u32 bits_per_pixel;
+       __u32 nonstd;
+       struct fb_bitfield red;
+       struct fb_bitfield green;
+       struct fb_bitfield blue;
+       struct fb_bitfield transp;
+};
+
+struct omapfb_vram_info {
+       __u32 total;
+       __u32 free;
+       __u32 largest_free_block;
+       __u32 reserved[5];
+};
+
+struct omapfb_tearsync_info {
+       __u8 enabled;
+       __u8 reserved1[3];
+       __u16 line;
+       __u16 reserved2;
+};
+
 #ifdef __KERNEL__
 
 #include <plat/board.h>
@@ -173,6 +221,11 @@ struct omapfb_mem_region {
        void __iomem    *vaddr;
        unsigned long   size;
        u8              type;           /* OMAPFB_PLANE_MEM_* */
+       enum omapfb_color_format format;/* OMAPFB_COLOR_* */
+       unsigned        format_used:1;  /* Must be set when format is set.
+                                        * Needed b/c of the badly chosen 0
+                                        * base for OMAPFB_COLOR_* values
+                                        */
        unsigned        alloc:1;        /* allocated by the driver */
        unsigned        map:1;          /* kernel mapped by the driver */
 };
@@ -189,6 +242,7 @@ struct omapfb_platform_data {
 };
 
 /* in arch/arm/plat-omap/fb.c */
+extern void omapfb_set_platform_data(struct omapfb_platform_data *data);
 extern void omapfb_set_ctrl_platform_data(void *pdata);
 extern void omapfb_reserve_sdram(void);