diff options
author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2011-11-16 09:53:44 -0500 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2011-12-02 01:54:51 -0500 |
commit | e70f98acaa84ec9ad55e544d0dc8b2d0a36bbeca (patch) | |
tree | 9ea6ccdd20f2a477aedebc4ff49d11eeb72d7c97 /drivers/video | |
parent | f1577ce18004337ec2f6f48109ca14cac10a0a4f (diff) |
OMAPDSS: APPLY: remove runtime_get
apply.c no longer touches any registers if an output is not enabled.
This means that we don't need to do dispc_runtime_get() anymore, and the
calls can be removed.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/omap2/dss/apply.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/video/omap2/dss/apply.c b/drivers/video/omap2/dss/apply.c index 443f31e74a75..4cc7c37acbb4 100644 --- a/drivers/video/omap2/dss/apply.c +++ b/drivers/video/omap2/dss/apply.c | |||
@@ -688,16 +688,11 @@ static void omap_dss_mgr_apply_mgr(struct omap_overlay_manager *mgr) | |||
688 | 688 | ||
689 | int omap_dss_mgr_apply(struct omap_overlay_manager *mgr) | 689 | int omap_dss_mgr_apply(struct omap_overlay_manager *mgr) |
690 | { | 690 | { |
691 | int r; | ||
692 | unsigned long flags; | 691 | unsigned long flags; |
693 | struct omap_overlay *ovl; | 692 | struct omap_overlay *ovl; |
694 | 693 | ||
695 | DSSDBG("omap_dss_mgr_apply(%s)\n", mgr->name); | 694 | DSSDBG("omap_dss_mgr_apply(%s)\n", mgr->name); |
696 | 695 | ||
697 | r = dispc_runtime_get(); | ||
698 | if (r) | ||
699 | return r; | ||
700 | |||
701 | spin_lock_irqsave(&data_lock, flags); | 696 | spin_lock_irqsave(&data_lock, flags); |
702 | 697 | ||
703 | /* Configure overlays */ | 698 | /* Configure overlays */ |
@@ -711,9 +706,7 @@ int omap_dss_mgr_apply(struct omap_overlay_manager *mgr) | |||
711 | 706 | ||
712 | spin_unlock_irqrestore(&data_lock, flags); | 707 | spin_unlock_irqrestore(&data_lock, flags); |
713 | 708 | ||
714 | dispc_runtime_put(); | 709 | return 0; |
715 | |||
716 | return r; | ||
717 | } | 710 | } |
718 | 711 | ||
719 | static void dss_apply_ovl_enable(struct omap_overlay *ovl, bool enable) | 712 | static void dss_apply_ovl_enable(struct omap_overlay *ovl, bool enable) |