From ffd6ff4e275031cc81f4b43ac78d07d62e231968 Mon Sep 17 00:00:00 2001 From: Gwanglim Lee Date: Mon, 4 May 2020 08:29:50 +0900 Subject: [PATCH] Revert "dpms: adapt silent boot" This reverts commit 6e1b55aaa0b135d3487c41b902948e60da449027. Change-Id: I0b8672243977c13289c26f6f003821174d3838b1 --- src/bin/e_comp_screen.c | 16 +++++----------- src/bin/e_output.c | 16 ++++------------ src/bin/e_plane.c | 10 ++-------- 3 files changed, 11 insertions(+), 31 deletions(-) diff --git a/src/bin/e_comp_screen.c b/src/bin/e_comp_screen.c index d2f741f388..f7cd6dc0b3 100644 --- a/src/bin/e_comp_screen.c +++ b/src/bin/e_comp_screen.c @@ -1,7 +1,6 @@ #include "e.h" #include "Eeze.h" #include -#include #define PATH "/org/enlightenment/wm" #define IFACE "org.enlightenment.wm.screen_rotation" @@ -773,17 +772,12 @@ _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 (device_get_reboot_mode() != SILENT_BOOT) + if (!e_output_dpms_set(output, E_OUTPUT_DPMS_ON)) { - 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; - } + 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"); @@ -1680,4 +1674,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 dab12cb1ce..6d91602ed1 100644 --- a/src/bin/e_output.c +++ b/src/bin/e_output.c @@ -1,5 +1,4 @@ #include "e.h" -#include #define EOERR(f, output, x...) \ do \ @@ -795,18 +794,11 @@ _e_output_primary_update(E_Output *output) output->fake_config = EINA_FALSE; - if (device_get_reboot_mode() != SILENT_BOOT) - { - ret = e_output_dpms_set(output, E_OUTPUT_DPMS_ON); - if (ret == EINA_FALSE) - { - EOERR("fail to e_output_dpms.", output); - return; - } - } - else + ret = e_output_dpms_set(output, E_OUTPUT_DPMS_ON); + if (ret == EINA_FALSE) { - EOINF("silent boot. do not set dpms", output); + EOERR("fail to e_output_dpms.", output); + return; } e_output_size_get(output, &w, &h); diff --git a/src/bin/e_plane.c b/src/bin/e_plane.c index 54d2bf9e63..3dbdaca56f 100644 --- a/src/bin/e_plane.c +++ b/src/bin/e_plane.c @@ -1,5 +1,4 @@ #include "e.h" -#include # include # include @@ -586,13 +585,8 @@ _e_plane_surface_from_ecore_evas_acquire(E_Plane *plane) } /* dpms on at the first */ - 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."); + if (!e_output_dpms_set(output, E_OUTPUT_DPMS_ON)) + WRN("fail to set the dpms on."); } /* aquire */ -- 2.34.1