1 files changed, 38 insertions, 14 deletions

diff --git a/drivers/video/omap/omapfb_main.c b/drivers/video/omap/omapfb_main.c
index 8862233d57b..db05f7e316e 100644
--- a/drivers/video/omap/omapfb_main.c
+++ b/drivers/video/omap/omapfb_main.c
@@ -67,6 +67,7 @@ static struct caps_table_struct ctrl_caps[] = {
         { OMAPFB_CAPS_WINDOW_PIXEL_DOUBLE, "pixel double window" },
         { OMAPFB_CAPS_WINDOW_SCALE,   "scale window" },
         { OMAPFB_CAPS_WINDOW_OVERLAY, "overlay window" },
+        { OMAPFB_CAPS_WINDOW_ROTATE,  "rotate window" },
         { OMAPFB_CAPS_SET_BACKLIGHT,  "backlight setting" },
 };
 
@@ -215,6 +216,15 @@ static int ctrl_change_mode(struct fb_info *fbi)
                                  offset, var->xres_virtual,
                                  plane->info.pos_x, plane->info.pos_y,
                                  var->xres, var->yres, plane->color_mode);
+        if (r < 0)
+                return r;
+
+        if (fbdev->ctrl->set_rotate != NULL) {
+                r = fbdev->ctrl->set_rotate(var->rotate);
+                if (r < 0)
+                        return r;
+        }
+
         if (fbdev->ctrl->set_scale != NULL)
                 r = fbdev->ctrl->set_scale(plane->idx,
                                    var->xres, var->yres,
@@ -600,7 +610,7 @@ static void omapfb_rotate(struct fb_info *fbi, int rotate)
         struct omapfb_device *fbdev = plane->fbdev;
 
         omapfb_rqueue_lock(fbdev);
-        if (cpu_is_omap15xx() && rotate != fbi->var.rotate) {
+        if (rotate != fbi->var.rotate) {
                 struct fb_var_screeninfo *new_var = &fbdev->new_var;
 
                 memcpy(new_var, &fbi->var, sizeof(*new_var));
@@ -707,28 +717,42 @@ int omapfb_update_window_async(struct fb_info *fbi,
                                 void (*callback)(void *),
                                 void *callback_data)
 {
+        int xres, yres;
         struct omapfb_plane_struct *plane = fbi->par;
         struct omapfb_device *fbdev = plane->fbdev;
-        struct fb_var_screeninfo *var;
+        struct fb_var_screeninfo *var = &fbi->var;
+
+        switch (var->rotate) {
+        case 0:
+        case 180:
+                xres = fbdev->panel->x_res;
+                yres = fbdev->panel->y_res;
+                break;
+        case 90:
+        case 270:
+                xres = fbdev->panel->y_res;
+                yres = fbdev->panel->x_res;
+                break;
+        default:
+                return -EINVAL;
+        }
 
-        var = &fbi->var;
-        if (win->x >= var->xres || win->y >= var->yres ||
-            win->out_x > var->xres || win->out_y >= var->yres)
+        if (win->x >= xres || win->y >= yres ||
+            win->out_x > xres || win->out_y > yres)
                 return -EINVAL;
 
         if (!fbdev->ctrl->update_window ||
             fbdev->ctrl->get_update_mode() != OMAPFB_MANUAL_UPDATE)
                 return -ENODEV;
 
-        if (win->x + win->width >= var->xres)
-                win->width = var->xres - win->x;
-        if (win->y + win->height >= var->yres)
-                win->height = var->yres - win->y;
-        /* The out sizes should be cropped to the LCD size */
-        if (win->out_x + win->out_width > fbdev->panel->x_res)
-                win->out_width = fbdev->panel->x_res - win->out_x;
-        if (win->out_y + win->out_height > fbdev->panel->y_res)
-                win->out_height = fbdev->panel->y_res - win->out_y;
+        if (win->x + win->width > xres)
+                win->width = xres - win->x;
+        if (win->y + win->height > yres)
+                win->height = yres - win->y;
+        if (win->out_x + win->out_width > xres)
+                win->out_width = xres - win->out_x;
+        if (win->out_y + win->out_height > yres)
+                win->out_height = yres - win->out_y;
         if (!win->width || !win->height || !win->out_width || !win->out_height)
                 return 0;