Skip to content

Commit

Permalink
OMAPDSS: clean up dss_mgr_set_lcd_config
Browse files Browse the repository at this point in the history
dss_mgr_set_lcd_config() can only be called when the output is not
active. This means that most of the code in the function is extra, as
there's no need to write the values to registers, etc, because that will
be handled when the output will be enabled.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
  • Loading branch information
Tomi Valkeinen committed Sep 7, 2012
1 parent f6a0492 commit aba9657
Showing 1 changed file with 2 additions and 12 deletions.
14 changes: 2 additions & 12 deletions drivers/video/omap2/dss/apply.c
Original file line number Diff line number Diff line change
Expand Up @@ -1346,27 +1346,17 @@ void dss_mgr_set_lcd_config(struct omap_overlay_manager *mgr,
unsigned long flags;
struct mgr_priv_data *mp = get_mgr_priv(mgr);

mutex_lock(&apply_lock);
spin_lock_irqsave(&data_lock, flags);

if (mp->enabled) {
DSSERR("cannot apply lcd config for %s: manager needs to be disabled\n",
mgr->name);
goto out;
}

spin_lock_irqsave(&data_lock, flags);

dss_apply_mgr_lcd_config(mgr, config);

dss_write_regs();
dss_set_go_bits();

spin_unlock_irqrestore(&data_lock, flags);

wait_pending_extra_info_updates();

out:
mutex_unlock(&apply_lock);
spin_unlock_irqrestore(&data_lock, flags);
}

int dss_ovl_set_info(struct omap_overlay *ovl,
Expand Down

0 comments on commit aba9657

Please sign in to comment.