Revert "Revert "dpms: adapt silent boot""

This reverts commit ffd6ff4e275031cc81f4b43ac78d07d62e231968.

Change-Id: I3d9789413debf4ae2acd90bc7f99d41152adf019
Signed-off-by: Junkyeong Kim <jk0430.kim@samsung.com>

diff --git a/src/bin/e_comp_screen.c b/src/bin/e_comp_screen.c
index 2dbf3fa142772da78154bbd2920c6515f225e37a..78ec7cac54759775e3f2eb667a1aeefa420c2c07 100644 (file)
--- a/src/bin/e_comp_screen.c
+++ b/src/bin/e_comp_screen.c
@@ -1,6 +1,7 @@
 #include "e.h"
 #include "Eeze.h"
 #include <tizen-extension-server-protocol.h>
+#include <device/booting-internal.h>
 
 #define PATH "/org/enlightenment/wm"
 #define IFACE "org.enlightenment.wm.screen_rotation"
@@ -774,12 +775,17 @@ _e_comp_screen_init_outputs(E_Comp_Screen *e_comp_screen)
         e_main_ts_end("\tE_Output Mode Apply Done");
 
         e_main_ts_begin("\tE_Output Set DPMS ON");
-        if (!e_output_dpms_set(output, E_OUTPUT_DPMS_ON))
+        if (device_get_reboot_mode() != SILENT_BOOT)
           {
-             e_main_ts_end("\tE_Output Set DPMS ON Failed");
-             ERR("fail to e_output_dpms.");
-             goto fail;
+             if (!e_output_dpms_set(output, E_OUTPUT_DPMS_ON))
+               {
+                  e_main_ts_end("\tE_Output Set DPMS ON Failed");
+                  ERR("fail to e_output_dpms.");
+                  goto fail;
+               }
           }
+        else
+          INF("silent reboot. do not set dpms");
         e_main_ts_end("\tE_Output Set DPMS ON Done");
 
         e_main_ts_begin("\tE_Output Hwc Setup");
@@ -1696,4 +1702,4 @@ e_comp_screen_debug_info_get(Eldbus_Message_Iter *iter)
    "=============================================================");
 
    eldbus_message_iter_container_close(iter, line_array);
-}
\ No newline at end of file
+}

diff --git a/src/bin/e_output.c b/src/bin/e_output.c
index 833651370ec1193dd2fc4eb3dd9fd372e4e9af0a..771ba6d38638816e064c6a9d1707a5fac93f6212 100644 (file)
--- a/src/bin/e_output.c
+++ b/src/bin/e_output.c
@@ -1,4 +1,5 @@
 #include "e.h"
+#include <device/booting-internal.h>
 
 #define EOERR(f, output, x...)                                   \
    do                                                            \
@@ -798,11 +799,18 @@ _e_output_primary_update(E_Output *output)
 
         output->fake_config = EINA_FALSE;
 
-        ret = e_output_dpms_set(output, E_OUTPUT_DPMS_ON);
-        if (ret == EINA_FALSE)
+        if (device_get_reboot_mode() != SILENT_BOOT)
           {
-             EOERR("fail to e_output_dpms.", output);
-             return;
+             ret = e_output_dpms_set(output, E_OUTPUT_DPMS_ON);
+             if (ret == EINA_FALSE)
+               {
+                  EOERR("fail to e_output_dpms.", output);
+                  return;
+               }
+          }
+        else
+          {
+             EOINF("silent boot. do not set dpms", output);
           }
 
         e_output_size_get(output, &w, &h);

diff --git a/src/bin/e_plane.c b/src/bin/e_plane.c
index 3dbdaca56f7678778f9384847e9a400f8b9f319e..54d2bf9e63c3385acfe55eb10beed816540efdad 100644 (file)
--- a/src/bin/e_plane.c
+++ b/src/bin/e_plane.c
@@ -1,4 +1,5 @@
 #include "e.h"
+#include <device/booting-internal.h>
 
 # include <tdm.h>
 # include <tdm_helper.h>
@@ -585,8 +586,13 @@ _e_plane_surface_from_ecore_evas_acquire(E_Plane *plane)
           }
 
         /* dpms on at the first */
-        if (!e_output_dpms_set(output, E_OUTPUT_DPMS_ON))
-          WRN("fail to set the dpms on.");
+        if (device_get_reboot_mode() != SILENT_BOOT)
+          {
+             if (!e_output_dpms_set(output, E_OUTPUT_DPMS_ON))
+               WRN("fail to set the dpms on.");
+          }
+        else
+          INF("silent boot. do not set dpms.");
      }
 
    /* aquire */