From 6e1b55aaa0b135d3487c41b902948e60da449027 Mon Sep 17 00:00:00 2001 From: Junkyeong Kim Date: Tue, 21 Apr 2020 18:15:13 +0900 Subject: [PATCH] dpms: adapt silent boot if device_get_reboot_mode function return SILENT_REBOOT, prevent enlightenment's dpms set by itself. Change-Id: I6ac0c7a48ddeed015d360326bd49020ac560cd50 Signed-off-by: Junkyeong Kim --- src/bin/e_comp_screen.c | 16 +++++++++++----- src/bin/e_output.c | 16 ++++++++++++---- src/bin/e_plane.c | 10 ++++++++-- 3 files changed, 31 insertions(+), 11 deletions(-) diff --git a/src/bin/e_comp_screen.c b/src/bin/e_comp_screen.c index f7cd6dc0b3..d2f741f388 100644 --- 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 +#include #define PATH "/org/enlightenment/wm" #define IFACE "org.enlightenment.wm.screen_rotation" @@ -772,12 +773,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"); @@ -1674,4 +1680,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 6d91602ed1..dab12cb1ce 100644 --- a/src/bin/e_output.c +++ b/src/bin/e_output.c @@ -1,4 +1,5 @@ #include "e.h" +#include #define EOERR(f, output, x...) \ do \ @@ -794,11 +795,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 3dbdaca56f..54d2bf9e63 100644 --- a/src/bin/e_plane.c +++ b/src/bin/e_plane.c @@ -1,4 +1,5 @@ #include "e.h" +#include # include # include @@ -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 */ -- 2.34.1