OMAPDSS: APPLY: move ovl->info to apply.c

struct omap_overlayr contains info and info_dirty fields, both of which
should be internal to apply.c.

This patch moves those fields into ovl_priv data, and names them
user_info and user_info_dirty.

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

diff --git a/drivers/video/omap2/dss/apply.c b/drivers/video/omap2/dss/apply.c
index 62319b8328da7f91de4ac30f830764cd46c901c4..debd37aa9128508aee55012272f06a41fad5f724 100644 (file)
--- a/drivers/video/omap2/dss/apply.c
+++ b/drivers/video/omap2/dss/apply.c
@@ -55,6 +55,10 @@
  */
 
 struct ovl_priv_data {
+
+       bool user_info_dirty;
+       struct omap_overlay_info user_info;
+
        /* If true, cache changed, but not written to shadow registers. Set
         * in apply(), cleared when registers written. */
        bool dirty;
@@ -129,7 +133,38 @@ static struct mgr_priv_data *get_mgr_priv(struct omap_overlay_manager *mgr)
 
 void dss_apply_init(void)
 {
+       const int num_ovls = dss_feat_get_num_ovls();
+       int i;
+
        spin_lock_init(&data_lock);
+
+       for (i = 0; i < num_ovls; ++i) {
+               struct ovl_priv_data *op;
+
+               op = &dss_data.ovl_priv_data_array[i];
+
+               op->info.global_alpha = 255;
+
+               switch (i) {
+               case 0:
+                       op->info.zorder = 0;
+                       break;
+               case 1:
+                       op->info.zorder =
+                               dss_has_feature(FEAT_ALPHA_FREE_ZORDER) ? 3 : 0;
+                       break;
+               case 2:
+                       op->info.zorder =
+                               dss_has_feature(FEAT_ALPHA_FREE_ZORDER) ? 2 : 0;
+                       break;
+               case 3:
+                       op->info.zorder =
+                               dss_has_feature(FEAT_ALPHA_FREE_ZORDER) ? 1 : 0;
+                       break;
+               }
+
+               op->user_info = op->info;
+       }
 }
 
 static bool ovl_manual_update(struct omap_overlay *ovl)
@@ -575,15 +610,15 @@ static void omap_dss_mgr_apply_ovl(struct omap_overlay *ovl)
 
        if (ovl->manager_changed) {
                ovl->manager_changed = false;
-               ovl->info_dirty  = true;
+               op->user_info_dirty  = true;
        }
 
-       if (!ovl->info_dirty)
+       if (!op->user_info_dirty)
                return;
 
-       ovl->info_dirty = false;
+       op->user_info_dirty = false;
        op->dirty = true;
-       op->info = ovl->info;
+       op->info = op->user_info;
 
        op->channel = ovl->manager->id;
 }
@@ -821,12 +856,13 @@ err:
 int dss_ovl_set_info(struct omap_overlay *ovl,
                struct omap_overlay_info *info)
 {
+       struct ovl_priv_data *op = get_ovl_priv(ovl);
        unsigned long flags;
 
        spin_lock_irqsave(&data_lock, flags);
 
-       ovl->info = *info;
-       ovl->info_dirty = true;
+       op->user_info = *info;
+       op->user_info_dirty = true;
 
        spin_unlock_irqrestore(&data_lock, flags);
 
@@ -836,11 +872,12 @@ int dss_ovl_set_info(struct omap_overlay *ovl,
 void dss_ovl_get_info(struct omap_overlay *ovl,
                struct omap_overlay_info *info)
 {
+       struct ovl_priv_data *op = get_ovl_priv(ovl);
        unsigned long flags;
 
        spin_lock_irqsave(&data_lock, flags);
 
-       *info = ovl->info;
+       *info = op->user_info;
 
        spin_unlock_irqrestore(&data_lock, flags);
 }

diff --git a/drivers/video/omap2/dss/overlay.c b/drivers/video/omap2/dss/overlay.c
index 7d7cdf62059bfbe45142fbee297bbb732e6a2ecd..8d036e661a2654dffbec385798f6650e7230f06b 100644 (file)
--- a/drivers/video/omap2/dss/overlay.c
+++ b/drivers/video/omap2/dss/overlay.c
@@ -124,19 +124,31 @@ err:
 
 static ssize_t overlay_input_size_show(struct omap_overlay *ovl, char *buf)
 {
+       struct omap_overlay_info info;
+
+       ovl->get_overlay_info(ovl, &info);
+
        return snprintf(buf, PAGE_SIZE, "%d,%d\n",
-                       ovl->info.width, ovl->info.height);
+                       info.width, info.height);
 }
 
 static ssize_t overlay_screen_width_show(struct omap_overlay *ovl, char *buf)
 {
-       return snprintf(buf, PAGE_SIZE, "%d\n", ovl->info.screen_width);
+       struct omap_overlay_info info;
+
+       ovl->get_overlay_info(ovl, &info);
+
+       return snprintf(buf, PAGE_SIZE, "%d\n", info.screen_width);
 }
 
 static ssize_t overlay_position_show(struct omap_overlay *ovl, char *buf)
 {
+       struct omap_overlay_info info;
+
+       ovl->get_overlay_info(ovl, &info);
+
        return snprintf(buf, PAGE_SIZE, "%d,%d\n",
-                       ovl->info.pos_x, ovl->info.pos_y);
+                       info.pos_x, info.pos_y);
 }
 
 static ssize_t overlay_position_store(struct omap_overlay *ovl,
@@ -170,8 +182,12 @@ static ssize_t overlay_position_store(struct omap_overlay *ovl,
 
 static ssize_t overlay_output_size_show(struct omap_overlay *ovl, char *buf)
 {
+       struct omap_overlay_info info;
+
+       ovl->get_overlay_info(ovl, &info);
+
        return snprintf(buf, PAGE_SIZE, "%d,%d\n",
-                       ovl->info.out_width, ovl->info.out_height);
+                       info.out_width, info.out_height);
 }
 
 static ssize_t overlay_output_size_store(struct omap_overlay *ovl,
@@ -231,8 +247,12 @@ static ssize_t overlay_enabled_store(struct omap_overlay *ovl, const char *buf,
 
 static ssize_t overlay_global_alpha_show(struct omap_overlay *ovl, char *buf)
 {
+       struct omap_overlay_info info;
+
+       ovl->get_overlay_info(ovl, &info);
+
        return snprintf(buf, PAGE_SIZE, "%d\n",
-                       ovl->info.global_alpha);
+                       info.global_alpha);
 }
 
 static ssize_t overlay_global_alpha_store(struct omap_overlay *ovl,
@@ -269,8 +289,12 @@ static ssize_t overlay_global_alpha_store(struct omap_overlay *ovl,
 static ssize_t overlay_pre_mult_alpha_show(struct omap_overlay *ovl,
                char *buf)
 {
+       struct omap_overlay_info info;
+
+       ovl->get_overlay_info(ovl, &info);
+
        return snprintf(buf, PAGE_SIZE, "%d\n",
-                       ovl->info.pre_mult_alpha);
+                       info.pre_mult_alpha);
 }
 
 static ssize_t overlay_pre_mult_alpha_store(struct omap_overlay *ovl,
@@ -306,7 +330,11 @@ static ssize_t overlay_pre_mult_alpha_store(struct omap_overlay *ovl,
 
 static ssize_t overlay_zorder_show(struct omap_overlay *ovl, char *buf)
 {
-       return snprintf(buf, PAGE_SIZE, "%d\n", ovl->info.zorder);
+       struct omap_overlay_info info;
+
+       ovl->get_overlay_info(ovl, &info);
+
+       return snprintf(buf, PAGE_SIZE, "%d\n", info.zorder);
 }
 
 static ssize_t overlay_zorder_store(struct omap_overlay *ovl,
@@ -456,29 +484,18 @@ void dss_init_overlays(struct platform_device *pdev)
                case 0:
                        ovl->name = "gfx";
                        ovl->id = OMAP_DSS_GFX;
-                       ovl->info.global_alpha = 255;
-                       ovl->info.zorder = 0;
                        break;
                case 1:
                        ovl->name = "vid1";
                        ovl->id = OMAP_DSS_VIDEO1;
-                       ovl->info.global_alpha = 255;
-                       ovl->info.zorder =
-                               dss_has_feature(FEAT_ALPHA_FREE_ZORDER) ? 3 : 0;
                        break;
                case 2:
                        ovl->name = "vid2";
                        ovl->id = OMAP_DSS_VIDEO2;
-                       ovl->info.global_alpha = 255;
-                       ovl->info.zorder =
-                               dss_has_feature(FEAT_ALPHA_FREE_ZORDER) ? 2 : 0;
                        break;
                case 3:
                        ovl->name = "vid3";
                        ovl->id = OMAP_DSS_VIDEO3;
-                       ovl->info.global_alpha = 255;
-                       ovl->info.zorder =
-                               dss_has_feature(FEAT_ALPHA_FREE_ZORDER) ? 1 : 0;
                        break;
                }
 

diff --git a/drivers/video/omap2/omapfb/omapfb-ioctl.c b/drivers/video/omap2/omapfb/omapfb-ioctl.c
index 562b5cc076091659d7b2984b78872f2ea8277b7d..16ba6196f330bc03dd4abbc7fdb7de738dae84f4 100644 (file)
--- a/drivers/video/omap2/omapfb/omapfb-ioctl.c
+++ b/drivers/video/omap2/omapfb/omapfb-ioctl.c
@@ -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->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;

diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c
index 91b49b5306958dce7193fd0d8373d65d4fc751c7..46024ab9dae6ac150a0df82eb521820ba6b89641 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);

diff --git a/include/video/omapdss.h b/include/video/omapdss.h
index 0d5333f6e4a12b172fd3c6e5730af37475c04b80..2e2c53f5e7cafb66dcdae4de5a8fd6c282a3a805 100644 (file)
--- a/include/video/omapdss.h
+++ b/include/video/omapdss.h
@@ -383,11 +383,8 @@ struct omap_overlay {
 
        /* dynamic fields */
        struct omap_overlay_manager *manager;
-       struct omap_overlay_info info;
 
        bool manager_changed;
-       /* if true, info has been changed, but not applied() yet */
-       bool info_dirty;
 
        int (*enable)(struct omap_overlay *ovl);
        int (*disable)(struct omap_overlay *ovl);