evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

OMAPDSS: APPLY: rename dirty & shadow_dirty

Browse source 
Rename ovl_priv_data's and mgr_priv_data's dirty and shadow_dirty fields
to info_dirty and shadow_info_dirty to better reflect what they mean.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
This commit is contained in:
Tomi Valkeinen 2011-11-16 14:31:58 +02:00
parent 6dc802e290
commit 0b53f17971
1 changed files with 27 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
drivers/video/omap2/dss/apply.c
View file

@ -31,8 +31,10 @@
* We have 4 levels of cache for the dispc settings. First two are in SW and * We have 4 levels of cache for the dispc settings. First two are in SW and
* the latter two in HW. * the latter two in HW.
* *
* set_info()
* v
* +--------------------+ * +--------------------+
* |overlay/manager_info| * | user_info |
* +--------------------+ * +--------------------+
* v * v
* apply() * apply()
@ -59,16 +61,11 @@ struct ovl_priv_data {
bool user_info_dirty; bool user_info_dirty;
struct omap_overlay_info user_info; struct omap_overlay_info user_info;
/* If true, cache changed, but not written to shadow registers. Set bool info_dirty;
* in apply(), cleared when registers written. */
bool dirty;
/* If true, shadow registers contain changed values not yet in real
* registers. Set when writing to shadow registers, cleared at
* VSYNC/EVSYNC */
bool shadow_dirty;
struct omap_overlay_info info; struct omap_overlay_info info;
bool shadow_info_dirty;
bool extra_info_dirty; bool extra_info_dirty;
bool shadow_extra_info_dirty; bool shadow_extra_info_dirty;
@ -82,16 +79,11 @@ struct mgr_priv_data {
bool user_info_dirty; bool user_info_dirty;
struct omap_overlay_manager_info user_info; struct omap_overlay_manager_info user_info;
/* If true, cache changed, but not written to shadow registers. Set bool info_dirty;
* in apply(), cleared when registers written. */
bool dirty;
/* If true, shadow registers contain changed values not yet in real
* registers. Set when writing to shadow registers, cleared at
* VSYNC/EVSYNC */
bool shadow_dirty;
struct omap_overlay_manager_info info; struct omap_overlay_manager_info info;
bool shadow_info_dirty;
/* If true, GO bit is up and shadow registers cannot be written. /* If true, GO bit is up and shadow registers cannot be written.
* Never true for manual update displays */ * Never true for manual update displays */
bool busy; bool busy;
@ -199,7 +191,7 @@ static bool need_isr(void)
return true; return true;
/* to write new values to registers */ /* to write new values to registers */
if (mp->dirty) if (mp->info_dirty)
return true; return true;
list_for_each_entry(ovl, &mgr->overlays, list) { list_for_each_entry(ovl, &mgr->overlays, list) {
@ -211,7 +203,7 @@ static bool need_isr(void)
continue; continue;
/* to write new values to registers */ /* to write new values to registers */
if (op->dirty || op->extra_info_dirty) if (op->info_dirty || op->extra_info_dirty)
return true; return true;
} }
} }
@ -228,12 +220,12 @@ static bool need_go(struct omap_overlay_manager *mgr)
mp = get_mgr_priv(mgr); mp = get_mgr_priv(mgr);
if (mp->shadow_dirty) if (mp->shadow_info_dirty)
return true; return true;
list_for_each_entry(ovl, &mgr->overlays, list) { list_for_each_entry(ovl, &mgr->overlays, list) {
op = get_ovl_priv(ovl); op = get_ovl_priv(ovl);
if (op->shadow_dirty || op->shadow_extra_info_dirty) if (op->shadow_info_dirty || op->shadow_extra_info_dirty)
return true; return true;
} }
@ -264,8 +256,8 @@ int dss_mgr_wait_for_go(struct omap_overlay_manager *mgr)
bool shadow_dirty, dirty; bool shadow_dirty, dirty;
spin_lock_irqsave(&data_lock, flags); spin_lock_irqsave(&data_lock, flags);
dirty = mp->dirty; dirty = mp->info_dirty;
shadow_dirty = mp->shadow_dirty; shadow_dirty = mp->shadow_info_dirty;
spin_unlock_irqrestore(&data_lock, flags); spin_unlock_irqrestore(&data_lock, flags);
if (!dirty && !shadow_dirty) { if (!dirty && !shadow_dirty) {
@ -327,8 +319,8 @@ int dss_mgr_wait_for_go_ovl(struct omap_overlay *ovl)
bool shadow_dirty, dirty; bool shadow_dirty, dirty;
spin_lock_irqsave(&data_lock, flags); spin_lock_irqsave(&data_lock, flags);
dirty = op->dirty; dirty = op->info_dirty;
shadow_dirty = op->shadow_dirty; shadow_dirty = op->shadow_info_dirty;
spin_unlock_irqrestore(&data_lock, flags); spin_unlock_irqrestore(&data_lock, flags);
if (!dirty && !shadow_dirty) { if (!dirty && !shadow_dirty) {
@ -371,7 +363,7 @@ static void dss_ovl_write_regs(struct omap_overlay *ovl)
DSSDBGF("%d", ovl->id); DSSDBGF("%d", ovl->id);
if (!op->enabled || !op->dirty) if (!op->enabled || !op->info_dirty)
return; return;
oi = &op->info; oi = &op->info;
@ -396,9 +388,9 @@ static void dss_ovl_write_regs(struct omap_overlay *ovl)
mp = get_mgr_priv(ovl->manager); mp = get_mgr_priv(ovl->manager);
op->dirty = false; op->info_dirty = false;
if (mp->updating) if (mp->updating)
op->shadow_dirty = true; op->shadow_info_dirty = true;
} }
static void dss_ovl_write_regs_extra(struct omap_overlay *ovl) static void dss_ovl_write_regs_extra(struct omap_overlay *ovl)
@ -443,12 +435,12 @@ static void dss_mgr_write_regs(struct omap_overlay_manager *mgr)
dss_ovl_write_regs_extra(ovl); dss_ovl_write_regs_extra(ovl);
} }
if (mp->dirty) { if (mp->info_dirty) {
dispc_mgr_setup(mgr->id, &mp->info); dispc_mgr_setup(mgr->id, &mp->info);
mp->dirty = false; mp->info_dirty = false;
if (mp->updating) if (mp->updating)
mp->shadow_dirty = true; mp->shadow_info_dirty = true;
} }
} }
@ -548,11 +540,11 @@ static void mgr_clear_shadow_dirty(struct omap_overlay_manager *mgr)
struct ovl_priv_data *op; struct ovl_priv_data *op;
mp = get_mgr_priv(mgr); mp = get_mgr_priv(mgr);
mp->shadow_dirty = false; mp->shadow_info_dirty = false;
list_for_each_entry(ovl, &mgr->overlays, list) { list_for_each_entry(ovl, &mgr->overlays, list) {
op = get_ovl_priv(ovl); op = get_ovl_priv(ovl);
op->shadow_dirty = false; op->shadow_info_dirty = false;
op->shadow_extra_info_dirty = false; op->shadow_extra_info_dirty = false;
} }
} }
@ -606,7 +598,7 @@ static void omap_dss_mgr_apply_ovl(struct omap_overlay *ovl)
return; return;
op->user_info_dirty = false; op->user_info_dirty = false;
op->dirty = true; op->info_dirty = true;
op->info = op->user_info; op->info = op->user_info;
} }
@ -625,7 +617,7 @@ static void omap_dss_mgr_apply_mgr(struct omap_overlay_manager *mgr)
return; return;
mp->user_info_dirty = false; mp->user_info_dirty = false;
mp->dirty = true; mp->info_dirty = true;
mp->info = mp->user_info; mp->info = mp->user_info;
} }