OMAP: DSS2: move update() and sync()

Move update() and sync() from omap_dss_device to omap_dss_driver.

Also, update was hardcoded to use virtual channel 0. This patch adds a
parameter that specifies the VC.

This is part of a larger patch-set, which moves the control from omapdss
driver to the display driver.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>

2 files changed, 10 insertions, 10 deletions

diff --git a/drivers/video/omap2/omapfb/omapfb-ioctl.c b/drivers/video/omap2/omapfb/omapfb-ioctl.c
index 4f68cb0d59de..1ffa760b8545 100644
--- a/drivers/video/omap2/omapfb/omapfb-ioctl.c
+++ b/drivers/video/omap2/omapfb/omapfb-ioctl.c
@@ -172,7 +172,7 @@ static int omapfb_update_window_nolock(struct fb_info *fbi,
         if (x + w > dw || y + h > dh)
                 return -EINVAL;
 
-        return display->update(display, x, y, w, h);
+        return display->driver->update(display, x, y, w, h);
 }
 
 /* This function is exported for SGX driver use */
@@ -496,18 +496,18 @@ int omapfb_ioctl(struct fb_info *fbi, unsigned int cmd, unsigned long arg)
         switch (cmd) {
         case OMAPFB_SYNC_GFX:
                 DBG("ioctl SYNC_GFX\n");
-                if (!display || !display->sync) {
+                if (!display || !display->driver->sync) {
                         /* DSS1 never returns an error here, so we neither */
                         /*r = -EINVAL;*/
                         break;
                 }
 
-                r = display->sync(display);
+                r = display->driver->sync(display);
                 break;
 
         case OMAPFB_UPDATE_WINDOW_OLD:
                 DBG("ioctl UPDATE_WINDOW_OLD\n");
-                if (!display || !display->update) {
+                if (!display || !display->driver->update) {
                         r = -EINVAL;
                         break;
                 }
@@ -525,7 +525,7 @@ int omapfb_ioctl(struct fb_info *fbi, unsigned int cmd, unsigned long arg)
 
         case OMAPFB_UPDATE_WINDOW:
                 DBG("ioctl UPDATE_WINDOW\n");
-                if (!display || !display->update) {
+                if (!display || !display->driver->update) {
                         r = -EINVAL;
                         break;
                 }
diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c
index c720842341b2..3dbbddc2d51e 100644
--- a/drivers/video/omap2/omapfb/omapfb-main.c
+++ b/drivers/video/omap2/omapfb/omapfb-main.c
@@ -1254,11 +1254,11 @@ static int omapfb_blank(int blank, struct fb_info *fbi)
 exit:
         omapfb_unlock(fbdev);
 
-        if (r == 0 && do_update && display->update) {
+        if (r == 0 && do_update && display->driver->update) {
                 u16 w, h;
                 display->driver->get_resolution(display, &w, &h);
 
-                r = display->update(display, 0, 0, w, h);
+                r = display->driver->update(display, 0, 0, w, h);
         }
 
         return r;
@@ -1639,8 +1639,8 @@ int omapfb_realloc_fbmem(struct fb_info *fbi, unsigned long size, int type)
         if (old_size == size && old_type == type)
                 return 0;
 
-        if (display && display->sync)
-                        display->sync(display);
+        if (display && display->driver->sync)
+                        display->driver->sync(display);
 
         omapfb_free_fbmem(fbi);
 
@@ -2221,7 +2221,7 @@ static int omapfb_probe(struct platform_device *pdev)
 
                         dssdrv->get_resolution(def_display,
                                         &w, &h);
-                        def_display->update(def_display, 0, 0, w, h);
+                        def_display->driver->update(def_display, 0, 0, w, h);
 #endif
                 } else {
                         if (dssdrv->set_update_mode)