OMAPDSS: APPLY: rewrite overlay enable/disable

Overlays are currently enabled and disabled with a boolean in the struct
omap_overlay_info. The overlay info is set with ovl->set_overlay_info(),
and made into use with mgr->apply().

This doesn't work properly, as the enable/disable status may affect also
other overlays, for example when using fifo-merge. Thus the enabling and
disabling of the overlay needs to be done outside the normal overlay
configuration.

This patch achieves that by doing the following things:

1) Add function pointers to struct omap_overlay: enable(), disable() and
is_enabled(). These are used to do the obvious. The functions may block.

2) Move the "enabled" field from struct omap_overlay to ovl_priv_data.

3) Add a new route for settings to be applied to the HW, called
"extra_info". The status of the normal info and extra_info are tracked
separately.

The point here is to allow the normal info to be changed and
applied in non-blocking matter, whereas the extra_info can only be
changed when holding the mutex. This makes it possible to, for example,
set the overlay enable flag, apply it, and wait until the HW has taken
the flag into use.

This is not possible if the enable flag would be in the normal info, as
a new value for the flag could be set at any time from the users of
omapdss.

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

1 files changed, 15 insertions, 18 deletions

diff --git a/drivers/media/video/omap/omap_vout.c b/drivers/media/video/omap/omap_vout.c
index 9c5c19f142d..27c19fe7868 100644
--- a/drivers/media/video/omap/omap_vout.c
+++ b/drivers/media/video/omap/omap_vout.c
@@ -423,7 +423,7 @@ static int omapvid_setup_overlay(struct omap_vout_device *vout,
                 "%s enable=%d addr=%x width=%d\n height=%d color_mode=%d\n"
                 "rotation=%d mirror=%d posx=%d posy=%d out_width = %d \n"
                 "out_height=%d rotation_type=%d screen_width=%d\n",
-                __func__, info.enabled, info.paddr, info.width, info.height,
+                __func__, ovl->is_enabled(ovl), info.paddr, info.width, info.height,
                 info.color_mode, info.rotation, info.mirror, info.pos_x,
                 info.pos_y, info.out_width, info.out_height, info.rotation_type,
                 info.screen_width);
@@ -942,12 +942,8 @@ static int omap_vout_release(struct file *file)
         /* Disable all the overlay managers connected with this interface */
         for (i = 0; i < ovid->num_overlays; i++) {
                 struct omap_overlay *ovl = ovid->overlays[i];
-                if (ovl->manager && ovl->manager->device) {
-                        struct omap_overlay_info info;
-                        ovl->get_overlay_info(ovl, &info);
-                        info.enabled = 0;
-                        ovl->set_overlay_info(ovl, &info);
-                }
+                if (ovl->manager && ovl->manager->device)
+                        ovl->disable(ovl);
         }
         /* Turn off the pipeline */
         ret = omapvid_apply_changes(vout);
@@ -1667,7 +1663,6 @@ static int vidioc_streamon(struct file *file, void *fh, enum v4l2_buf_type i)
                 if (ovl->manager && ovl->manager->device) {
                         struct omap_overlay_info info;
                         ovl->get_overlay_info(ovl, &info);
-                        info.enabled = 1;
                         info.paddr = addr;
                         if (ovl->set_overlay_info(ovl, &info)) {
                                 ret = -EINVAL;
@@ -1686,6 +1681,16 @@ static int vidioc_streamon(struct file *file, void *fh, enum v4l2_buf_type i)
         if (ret)
                 v4l2_err(&vout->vid_dev->v4l2_dev, "failed to change mode\n");
 
+        for (j = 0; j < ovid->num_overlays; j++) {
+                struct omap_overlay *ovl = ovid->overlays[j];
+
+                if (ovl->manager && ovl->manager->device) {
+                        ret = ovl->enable(ovl);
+                        if (ret)
+                                goto streamon_err1;
+                }
+        }
+
         ret = 0;
 
 streamon_err1:
@@ -1715,16 +1720,8 @@ static int vidioc_streamoff(struct file *file, void *fh, enum v4l2_buf_type i)
         for (j = 0; j < ovid->num_overlays; j++) {
                 struct omap_overlay *ovl = ovid->overlays[j];
 
-                if (ovl->manager && ovl->manager->device) {
-                        struct omap_overlay_info info;
-
-                        ovl->get_overlay_info(ovl, &info);
-                        info.enabled = 0;
-                        ret = ovl->set_overlay_info(ovl, &info);
-                        if (ret)
-                                v4l2_err(&vout->vid_dev->v4l2_dev,
-                                "failed to update overlay info in streamoff\n");
-                }
+                if (ovl->manager && ovl->manager->device)
+                        ovl->disable(ovl);
         }
 
         /* Turn of the pipeline */