Merge branch 'fbdev-next' of git://github.com/schandinat/linux-2.6

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / video / omap2 / omapfb / omapfb-main.c

diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c
index 68ba1f8..ce15831 100644 (file)
--- a/drivers/video/omap2/omapfb/omapfb-main.c
+++ b/drivers/video/omap2/omapfb/omapfb-main.c
@@ -970,16 +970,20 @@ int omapfb_apply_changes(struct fb_info *fbi, int init)
                                outh = var->yres;
                        }
                } else {
-                       outw = ovl->info.out_width;
-                       outh = ovl->info.out_height;
+                       struct omap_overlay_info info;
+                       ovl->get_overlay_info(ovl, &info);
+                       outw = info.out_width;
+                       outh = info.out_height;
                }
 
                if (init) {
                        posx = 0;
                        posy = 0;
                } else {
-                       posx = ovl->info.pos_x;
-                       posy = ovl->info.pos_y;
+                       struct omap_overlay_info info;
+                       ovl->get_overlay_info(ovl, &info);
+                       posx = info.pos_x;
+                       posy = info.pos_y;
                }
 
                r = omapfb_setup_overlay(fbi, ovl, posx, posy, outw, outh);
@@ -2067,6 +2071,8 @@ static int omapfb_create_framebuffers(struct omapfb2_device *fbdev)
                if (ofbi->num_overlays > 0) {
                        struct omap_overlay *ovl = ofbi->overlays[0];
 
+                       ovl->manager->apply(ovl->manager);
+
                        r = omapfb_overlay_enable(ovl, 1);
 
                        if (r) {