diff options
| author | taeyoung <ty317.kim@samsung.com> | 2016-12-27 17:45:38 +0900 |
|---|---|---|
| committer | taeyoung <ty317.kim@samsung.com> | 2016-12-27 20:22:03 +0900 |
| commit | 5ee8fc14cf9ecb8cdb574eda0c57e04dc23d7871 (patch) | |
| tree | 19108676a1305a8178460d1f5c8298be61660bb2 | |
| parent | c9e0c4ead3ad322b2c064cf9dc0daf7b24969eed (diff) | |
| download | deviced-accepted/tizen_3.0.m2_mobile.tar.gz deviced-accepted/tizen_3.0.m2_mobile.tar.bz2 deviced-accepted/tizen_3.0.m2_mobile.zip | |
display: remove dpms get operation during dpms settingsubmit/tizen_3.0/20161227.120351submit/tizen_3.0.m2/20170104.093751accepted/tizen/3.0/wearable/20161228.022340accepted/tizen/3.0/tv/20161228.022324accepted/tizen/3.0/mobile/20161228.022309accepted/tizen/3.0/ivi/20161228.022400accepted/tizen/3.0/common/20161228.071713accepted/tizen/3.0.m2/wearable/20170104.142353accepted/tizen/3.0.m2/tv/20170104.142102accepted/tizen/3.0.m2/mobile/20170104.141623tizen_3.0.m2accepted/tizen_3.0.m2_wearableaccepted/tizen_3.0.m2_tvaccepted/tizen_3.0.m2_mobile
dpms setting is async function. So, dpms get function
will return failure if is is called just after dpms setting.
Thus dpms get function is removed from the dpms setting operation.
Change-Id: I6930bcb1397c703c723b439fc75ed1e370b5626e
Signed-off-by: taeyoung <ty317.kim@samsung.com>
| -rw-r--r-- | src/display/device-interface.c | 40 | ||||
| -rw-r--r-- | src/display/device-interface.h | 2 | ||||
| -rw-r--r-- | src/display/dpms-wayland-none.c | 14 |
3 files changed, 21 insertions, 35 deletions
diff --git a/src/display/device-interface.c b/src/display/device-interface.c index d23b74f5..79aca9f4 100644 --- a/src/display/device-interface.c +++ b/src/display/device-interface.c @@ -308,25 +308,12 @@ static int backlight_off(enum device_flags flags) static int backlight_on(enum device_flags flags) { int ret = -1; - int i; _D("LCD on %x", flags); - for (i = 0; i < PM_LCD_RETRY_CNT; i++) { - ret = bl_onoff(DPMS_ON); - if (get_lcd_power() == DPMS_ON) { -#ifdef ENABLE_PM_LOG - pm_history_save(PM_LOG_LCD_ON, pm_cur_state); -#endif - break; - } else { -#ifdef ENABLE_PM_LOG - pm_history_save(PM_LOG_LCD_ON_FAIL, pm_cur_state); -#endif - _E("Failed to LCD on, through OAL"); - ret = -1; - } - } + ret = bl_onoff(DPMS_ON); + if (ret < 0) + _E("Failed to turn on backlight"); if (flags & LCD_PHASED_TRANSIT_MODE) change_brightness(LCD_PHASED_MIN_BRIGHTNESS, @@ -338,7 +325,6 @@ static int backlight_on(enum device_flags flags) static int backlight_off(enum device_flags flags) { int ret = -1; - int i; _D("LCD off %x", flags); @@ -346,22 +332,10 @@ static int backlight_off(enum device_flags flags) change_brightness(default_brightness, LCD_PHASED_MIN_BRIGHTNESS, LCD_PHASED_CHANGE_STEP); - for (i = 0; i < PM_LCD_RETRY_CNT; i++) { - usleep(30000); - ret = bl_onoff(DPMS_OFF); - if (get_lcd_power() == DPMS_OFF) { -#ifdef ENABLE_PM_LOG - pm_history_save(PM_LOG_LCD_OFF, pm_cur_state); -#endif - break; - } else { -#ifdef ENABLE_PM_LOG - pm_history_save(PM_LOG_LCD_OFF_FAIL, pm_cur_state); -#endif - _E("Failed to LCD off, through OAL"); - ret = -1; - } - } + ret = bl_onoff(DPMS_OFF); + if (ret < 0) + _E("Failed to turn off backlight"); + return ret; } #endif diff --git a/src/display/device-interface.h b/src/display/device-interface.h index 9b93328a..cd29d238 100644 --- a/src/display/device-interface.h +++ b/src/display/device-interface.h @@ -36,8 +36,6 @@ #define PM_DEFAULT_BRIGHTNESS 60 #define PM_DIM_BRIGHTNESS 0 -#define PM_LCD_RETRY_CNT 3 - #define DISP_INDEX_SHIFT 16 #define DISP_CMD(prop, index) ((index << DISP_INDEX_SHIFT) | prop) diff --git a/src/display/dpms-wayland-none.c b/src/display/dpms-wayland-none.c index f5d8e72b..a611ea88 100644 --- a/src/display/dpms-wayland-none.c +++ b/src/display/dpms-wayland-none.c @@ -21,6 +21,7 @@ #include "core/edbus-handler.h" #include "device-interface.h" #include "util.h" +#include "core.h" #define ENLIGHTENMENT_BUS_NAME "org.enlightenment.wm" #define ENLIGHTENMENT_OBJECT_PATH "/org/enlightenment/wm" @@ -48,6 +49,19 @@ static void dpms_set_cb(void *data, DBusMessage *msg, DBusError *r_err) } _D("DPMS was set %d", state); + +#ifdef ENABLE_PM_LOG + switch (state) { + case DPMS_ON: + pm_history_save(PM_LOG_LCD_ON, pm_cur_state); + break; + case DPMS_OFF: + pm_history_save(PM_LOG_LCD_OFF, pm_cur_state); + break; + default: + break; + } +#endif } int dpms_set_power(enum dpms_state state) |