Apply dpms cache globally

Existing get_lcd_power() accesses to node directly, but it now uses
dpms_get_cached_state() instead. Accessing to the node is separated
into another function, get_lcd_power_node().

Change-Id: Ic05ce15d0fd1ec603c88db470144631a7e1b3ebd
Signed-off-by: Youngjae Cho <y0.cho@samsung.com>

diff --git a/plugins/iot/display/device-interface.c b/plugins/iot/display/device-interface.c
index 06ca0ad..ea407fb 100644 (file)
--- a/plugins/iot/display/device-interface.c
+++ b/plugins/iot/display/device-interface.c
@@ -153,14 +153,6 @@ static int get_lcd_power_node(void)
        }
 }
 
-static int get_lcd_power(void)
-{
-       if (display_dev && display_dev->get_state)
-               return get_lcd_power_node();
-       else
-               return dpms_get_state();
-}
-
 bool display_dimstay_check(void)
 {
        if (get_pm_status_flag() & DIM_FLAG)
@@ -357,7 +349,7 @@ static int backlight_standby(int force)
 {
        int ret = -1;
 
-       if ((get_lcd_power() == DPMS_ON) || force) {
+       if ((dpms_get_cached_state() == DPMS_ON) || force) {
                _I("LCD standby");
                ret = bl_onoff(DPMS_STANDBY, 0);
        }
@@ -740,8 +732,8 @@ static struct _backlight_ops backlight_ops = {
        .standby = backlight_standby,
        .set_default_brt = set_default_brt,
        .get_default_brt = get_default_brt,
-       .get_lcd_power = get_lcd_power,
-       .get_lcd_power_cached = dpms_get_cached_state,
+       .get_lcd_power = dpms_get_cached_state,
+       .get_lcd_power_node = get_lcd_power_node,
        .set_custom_status = set_custom_status,
        .get_custom_status = get_custom_status,
        .save_custom_brightness = save_custom_brightness,

diff --git a/plugins/mobile/display/device-interface.c b/plugins/mobile/display/device-interface.c
index b1a1356..d4ef77b 100644 (file)
--- a/plugins/mobile/display/device-interface.c
+++ b/plugins/mobile/display/device-interface.c
@@ -152,14 +152,6 @@ static int get_lcd_power_node(void)
        }
 }
 
-static int get_lcd_power(void)
-{
-       if (display_dev && display_dev->get_state)
-               return get_lcd_power_node();
-       else
-               return dpms_get_state();
-}
-
 bool display_dimstay_check(void)
 {
        if (get_pm_status_flag() & DIM_FLAG)
@@ -356,7 +348,7 @@ static int backlight_standby(int force)
 {
        int ret = -1;
 
-       if ((get_lcd_power() == DPMS_ON) || force) {
+       if ((dpms_get_cached_state() == DPMS_ON) || force) {
                _I("LCD standby");
                ret = bl_onoff(DPMS_STANDBY, 0);
        }
@@ -739,8 +731,8 @@ static struct _backlight_ops backlight_ops = {
        .standby = backlight_standby,
        .set_default_brt = set_default_brt,
        .get_default_brt = get_default_brt,
-       .get_lcd_power = get_lcd_power,
-       .get_lcd_power_cached = dpms_get_cached_state,
+       .get_lcd_power = dpms_get_cached_state,
+       .get_lcd_power_node = get_lcd_power_node,
        .set_custom_status = set_custom_status,
        .get_custom_status = get_custom_status,
        .save_custom_brightness = save_custom_brightness,

diff --git a/plugins/tv/display/device-interface.c b/plugins/tv/display/device-interface.c
index 9a47571..da6583c 100644 (file)
--- a/plugins/tv/display/device-interface.c
+++ b/plugins/tv/display/device-interface.c
@@ -153,14 +153,6 @@ static int get_lcd_power_node(void)
        }
 }
 
-static int get_lcd_power(void)
-{
-       if (display_dev && display_dev->get_state)
-               return get_lcd_power_node();
-       else
-               return dpms_get_state();
-}
-
 bool display_dimstay_check(void)
 {
        if (get_pm_status_flag() & DIM_FLAG)
@@ -357,7 +349,7 @@ static int backlight_standby(int force)
 {
        int ret = -1;
 
-       if ((get_lcd_power() == DPMS_ON) || force) {
+       if ((dpms_get_cached_state() == DPMS_ON) || force) {
                _I("LCD standby");
                ret = bl_onoff(DPMS_STANDBY, 0);
        }
@@ -740,8 +732,8 @@ static struct _backlight_ops backlight_ops = {
        .standby = backlight_standby,
        .set_default_brt = set_default_brt,
        .get_default_brt = get_default_brt,
-       .get_lcd_power = get_lcd_power,
-       .get_lcd_power_cached = dpms_get_cached_state,
+       .get_lcd_power = dpms_get_cached_state,
+       .get_lcd_power_node = get_lcd_power_node,
        .set_custom_status = set_custom_status,
        .get_custom_status = get_custom_status,
        .save_custom_brightness = save_custom_brightness,

diff --git a/plugins/wearable/display/device-interface.c b/plugins/wearable/display/device-interface.c
index d2ee406..655a102 100644 (file)
--- a/plugins/wearable/display/device-interface.c
+++ b/plugins/wearable/display/device-interface.c
@@ -167,14 +167,6 @@ static int get_lcd_power_node(void)
        }
 }
 
-static int get_lcd_power(void)
-{
-       if (display_dev && display_dev->get_state)
-               return get_lcd_power_node();
-       else
-               return dpms_get_state();
-}
-
 bool display_dimstay_check(void)
 {
        if (get_pm_status_flag() & DIM_FLAG)
@@ -368,7 +360,7 @@ static int backlight_standby(int force)
 {
        int ret = -1;
 
-       if ((get_lcd_power() == DPMS_ON) || force) {
+       if ((dpms_get_cached_state() == DPMS_ON) || force) {
                _I("LCD standby");
                ret = bl_onoff(DPMS_STANDBY, 0);
        }
@@ -805,8 +797,8 @@ static struct _backlight_ops backlight_ops = {
        .standby = backlight_standby,
        .set_default_brt = set_default_brt,
        .get_default_brt = get_default_brt,
-       .get_lcd_power = get_lcd_power,
-       .get_lcd_power_cached = dpms_get_cached_state,
+       .get_lcd_power = dpms_get_cached_state,
+       .get_lcd_power_node = get_lcd_power_node,
        .set_custom_status = set_custom_status,
        .get_custom_status = get_custom_status,
        .save_custom_brightness = save_custom_brightness,

diff --git a/src/display/device-interface.h b/src/display/device-interface.h
index 4193de8..161c528 100644 (file)
--- a/src/display/device-interface.h
+++ b/src/display/device-interface.h
@@ -69,7 +69,7 @@ struct _backlight_ops {
        int (*set_default_brt)(int level);
        int (*get_default_brt)(void);
        int (*get_lcd_power)(void);
-       int (*get_lcd_power_cached)(void);
+       int (*get_lcd_power_node)(void);
        int (*set_custom_status)(bool on);
        bool (*get_custom_status)(void);
        int (*save_custom_brightness)(void);

diff --git a/src/touchscreen/touchscreen.c b/src/touchscreen/touchscreen.c
index b2c8182..5ec95d1 100644 (file)
--- a/src/touchscreen/touchscreen.c
+++ b/src/touchscreen/touchscreen.c
@@ -193,9 +193,6 @@ static int touchscreen_start(enum device_flags flags)
        if (touchscreen_enable != DEVICE_OPS_STATUS_START)
                return 0;
 
-       if (!backlight_ops || !backlight_ops->get_lcd_power)
-               return -ENOTSUP;
-
        /* Do not enable touchscreen during silent boot mode */
        if (silent_boot && !booting_done(NULL))
                return -ENOTSUP;
@@ -206,8 +203,8 @@ static int touchscreen_start(enum device_flags flags)
        ret = touchscreen_set_state(TOUCHSCREEN_ON);
 
        state = -1;
-       if (backlight_ops && backlight_ops->get_lcd_power_cached)
-               state = backlight_ops->get_lcd_power_cached();
+       if (backlight_ops && backlight_ops->get_lcd_power)
+               state = backlight_ops->get_lcd_power();
 
        if (state == DPMS_OFF)
                touchscreen_powersaving(POWERSAVING_ON);