OMAPDSS: Adapt DSS driver for skipping initialization during bootup

[android-sdk/kernel-video.git] / drivers / video / fbdev / omap2 / dss / manager.c

diff --git a/drivers/video/fbdev/omap2/dss/manager.c b/drivers/video/fbdev/omap2/dss/manager.c
index 1aac9b4191a9762e7556dcb2485c178fa0ff17d2..fb6ebdfd16630c2129d7cdfacca01aba76a840c8 100644 (file)
--- a/drivers/video/fbdev/omap2/dss/manager.c
+++ b/drivers/video/fbdev/omap2/dss/manager.c
@@ -231,6 +231,9 @@ int dss_mgr_check(struct omap_overlay_manager *mgr,
        struct omap_overlay *ovl;
        int r;
 
+       if (omapdss_skipinit())
+               return 0;
+
        if (dss_has_feature(FEAT_ALPHA_FREE_ZORDER)) {
                r = dss_mgr_check_zorder(mgr, overlay_infos);
                if (r)