1 files changed, 15 insertions, 31 deletions

diff --git a/drivers/video/omap2/omapfb/omapfb-ioctl.c b/drivers/video/omap2/omapfb/omapfb-ioctl.c
index 532a31b3d96b..d30b45d72649 100644
--- a/drivers/video/omap2/omapfb/omapfb-ioctl.c
+++ b/drivers/video/omap2/omapfb/omapfb-ioctl.c
@@ -28,10 +28,10 @@
 #include <linux/omapfb.h>
 #include <linux/vmalloc.h>
 #include <linux/export.h>
+#include <linux/sizes.h>
 
 #include <video/omapdss.h>
 #include <video/omapvrfb.h>
-#include <plat/vram.h>
 
 #include "omapfb.h"
 
@@ -211,6 +211,7 @@ 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 omap_dss_device *display = fb2display(fbi);
         struct omapfb2_mem_region *rg;
         int r = 0, i;
         size_t size;
@@ -220,6 +221,9 @@ static int omapfb_setup_mem(struct fb_info *fbi, struct omapfb_mem_info *mi)
 
         size = PAGE_ALIGN(mi->size);
 
+        if (display && display->driver->sync)
+                display->driver->sync(display);
+
         rg = ofbi->region;
 
         down_write_nested(&rg->lock, rg->id);
@@ -279,7 +283,7 @@ static int omapfb_query_mem(struct fb_info *fbi, struct omapfb_mem_info *mi)
         return 0;
 }
 
-static int omapfb_update_window_nolock(struct fb_info *fbi,
+static int omapfb_update_window(struct fb_info *fbi,
                 u32 x, u32 y, u32 w, u32 h)
 {
         struct omap_dss_device *display = fb2display(fbi);
@@ -299,27 +303,6 @@ static int omapfb_update_window_nolock(struct fb_info *fbi,
         return display->driver->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;
-
-        if (!lock_fb_info(fbi))
-                return -ENODEV;
-        omapfb_lock(fbdev);
-
-        r = omapfb_update_window_nolock(fbi, x, y, w, h);
-
-        omapfb_unlock(fbdev);
-        unlock_fb_info(fbi);
-
-        return r;
-}
-EXPORT_SYMBOL(omapfb_update_window);
-
 int omapfb_set_update_mode(struct fb_info *fbi,
                                    enum omapfb_update_mode mode)
 {
@@ -646,7 +629,7 @@ int omapfb_ioctl(struct fb_info *fbi, unsigned int cmd, unsigned long arg)
                         break;
                 }
 
-                r = omapfb_update_window_nolock(fbi, p.uwnd_o.x, p.uwnd_o.y,
+                r = omapfb_update_window(fbi, p.uwnd_o.x, p.uwnd_o.y,
                                 p.uwnd_o.width, p.uwnd_o.height);
                 break;
 
@@ -663,7 +646,7 @@ int omapfb_ioctl(struct fb_info *fbi, unsigned int cmd, unsigned long arg)
                         break;
                 }
 
-                r = omapfb_update_window_nolock(fbi, p.uwnd.x, p.uwnd.y,
+                r = omapfb_update_window(fbi, p.uwnd.x, p.uwnd.y,
                                 p.uwnd.width, p.uwnd.height);
                 break;
 
@@ -853,14 +836,15 @@ int omapfb_ioctl(struct fb_info *fbi, unsigned int cmd, unsigned long arg)
                 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;
+                /*
+                 * We don't have the ability to get this vram info anymore.
+                 * Fill in something that should keep the applications working.
+                 */
+                p.vram_info.total = SZ_1M * 64;
+                p.vram_info.free = SZ_1M * 64;
+                p.vram_info.largest_free_block = SZ_1M * 64;
 
                 if (copy_to_user((void __user *)arg, &p.vram_info,
                                         sizeof(p.vram_info)))