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

* 'fbdev-next' of git://github.com/schandinat/linux-2.6: (175 commits)
  module_param: make bool parameters really bool (drivers/video/i810)
  Revert "atmel_lcdfb: Adjust HFP calculation so it matches the manual."
  OMAPDSS: HDMI: Disable DDC internal pull up
  OMAPDSS: HDMI: Move duplicate code from boardfile
  OMAPDSS: add OrtusTech COM43H4M10XTC display support
  OMAP: DSS2: Support for UMSH-8173MD TFT panel
  ASoC: OMAP: HDMI: Move HDMI codec trigger function to generic HDMI driver
  OMAPDSS: HDMI: Create function to enable HDMI audio
  ASoC: OMAP: HDMI: Correct signature of ASoC functions
  ASoC: OMAP: HDMI: Introduce driver data for audio codec
  grvga: fix section mismatch warnings
  video: s3c-fb: Don't keep device runtime active when open
  video: s3c-fb: Hold runtime PM references when touching registers
  video: s3c-fb: Take a runtime PM reference when unblanked
  video: s3c-fb: Disable runtime PM in error paths from probe
  video: s3c-fb: Use s3c_fb_enable() to enable the framebuffer
  video: s3c-fb: Make runtime PM functional again
  drivers/video: fsl-diu-fb: merge fsl_diu_alloc() into map_video_memory()
  drivers/video: fsl-diu-fb: add default platform ops functions
  drivers/video: fsl-diu-fb: remove broken reference count enabling the display
  ...

4 files changed, 39 insertions, 32 deletions

diff --git a/drivers/video/omap2/omapfb/omapfb-ioctl.c b/drivers/video/omap2/omapfb/omapfb-ioctl.c
index df7bcce5b107..16ba6196f330 100644
--- a/drivers/video/omap2/omapfb/omapfb-ioctl.c
+++ b/drivers/video/omap2/omapfb/omapfb-ioctl.c
@@ -111,28 +111,22 @@ static int omapfb_setup_plane(struct fb_info *fbi, struct omapfb_plane_info *pi)
                 set_fb_fix(fbi);
         }
 
-        if (pi->enabled) {
-                struct omap_overlay_info info;
+        if (!pi->enabled) {
+                r = ovl->disable(ovl);
+                if (r)
+                        goto undo;
+        }
 
+        if (pi->enabled) {
                 r = omapfb_setup_overlay(fbi, ovl, pi->pos_x, pi->pos_y,
                         pi->out_width, pi->out_height);
                 if (r)
                         goto undo;
-
-                ovl->get_overlay_info(ovl, &info);
-
-                if (!info.enabled) {
-                        info.enabled = pi->enabled;
-                        r = ovl->set_overlay_info(ovl, &info);
-                        if (r)
-                                goto undo;
-                }
         } else {
                 struct omap_overlay_info info;
 
                 ovl->get_overlay_info(ovl, &info);
 
-                info.enabled = pi->enabled;
                 info.pos_x = pi->pos_x;
                 info.pos_y = pi->pos_y;
                 info.out_width = pi->out_width;
@@ -146,6 +140,12 @@ static int omapfb_setup_plane(struct fb_info *fbi, struct omapfb_plane_info *pi)
         if (ovl->manager)
                 ovl->manager->apply(ovl->manager);
 
+        if (pi->enabled) {
+                r = ovl->enable(ovl);
+                if (r)
+                        goto undo;
+        }
+
         /* Release the locks in a specific order to keep lockdep happy */
         if (old_rg->id > new_rg->id) {
                 omapfb_put_mem_region(old_rg);
@@ -189,19 +189,19 @@ static int omapfb_query_plane(struct fb_info *fbi, struct omapfb_plane_info *pi)
                 memset(pi, 0, sizeof(*pi));
         } else {
                 struct omap_overlay *ovl;
-                struct omap_overlay_info *ovli;
+                struct omap_overlay_info ovli;
 
                 ovl = ofbi->overlays[0];
-                ovli = &ovl->info;
+                ovl->get_overlay_info(ovl, &ovli);
 
-                pi->pos_x = ovli->pos_x;
-                pi->pos_y = ovli->pos_y;
-                pi->enabled = ovli->enabled;
+                pi->pos_x = ovli.pos_x;
+                pi->pos_y = ovli.pos_y;
+                pi->enabled = ovl->is_enabled(ovl);
                 pi->channel_out = 0; /* xxx */
                 pi->mirror = 0;
                 pi->mem_idx = get_mem_idx(ofbi);
-                pi->out_width = ovli->out_width;
-                pi->out_height = ovli->out_height;
+                pi->out_width = ovli.out_width;
+                pi->out_height = ovli.out_height;
         }
 
         return 0;
@@ -238,7 +238,9 @@ static int omapfb_setup_mem(struct fb_info *fbi, struct omapfb_mem_info *mi)
                         continue;
 
                 for (j = 0; j < ofbi2->num_overlays; j++) {
-                        if (ofbi2->overlays[j]->info.enabled) {
+                        struct omap_overlay *ovl;
+                        ovl = ofbi2->overlays[j];
+                        if (ovl->is_enabled(ovl)) {
                                 r = -EBUSY;
                                 goto out;
                         }
diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c
index 68ba1f800082..ce158311ff59 100644
--- 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) {
diff --git a/drivers/video/omap2/omapfb/omapfb-sysfs.c b/drivers/video/omap2/omapfb/omapfb-sysfs.c
index 1694d5148f32..e8d8cc76a435 100644
--- a/drivers/video/omap2/omapfb/omapfb-sysfs.c
+++ b/drivers/video/omap2/omapfb/omapfb-sysfs.c
@@ -473,7 +473,9 @@ static ssize_t store_size(struct device *dev, struct device_attribute *attr,
                         continue;
 
                 for (j = 0; j < ofbi2->num_overlays; j++) {
-                        if (ofbi2->overlays[j]->info.enabled) {
+                        struct omap_overlay *ovl;
+                        ovl = ofbi2->overlays[j];
+                        if (ovl->is_enabled(ovl)) {
                                 r = -EBUSY;
                                 goto out;
                         }
diff --git a/drivers/video/omap2/omapfb/omapfb.h b/drivers/video/omap2/omapfb/omapfb.h
index e12d384ea520..c0bdc9b54ecf 100644
--- a/drivers/video/omap2/omapfb/omapfb.h
+++ b/drivers/video/omap2/omapfb/omapfb.h
@@ -181,13 +181,10 @@ static inline void omapfb_unlock(struct omapfb2_device *fbdev)
 static inline int omapfb_overlay_enable(struct omap_overlay *ovl,
                 int enable)
 {
-        struct omap_overlay_info info;
-
-        ovl->get_overlay_info(ovl, &info);
-        if (info.enabled == enable)
-                return 0;
-        info.enabled = enable;
-        return ovl->set_overlay_info(ovl, &info);
+        if (enable)
+                return ovl->enable(ovl);
+        else
+                return ovl->disable(ovl);
 }
 
 static inline struct omapfb2_mem_region *