Merge lp:~albaguirre/unity-system-compositor/fix-1336411 into lp:unity-system-compositor

[Alberto Aguirre]

Request disabling suspend before turning backlight/display on (LP: #1336411)

Request disabling suspend before turning backlight/display on (LP: #1336411)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:145
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ci/128/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-utopic-amd64-ci/24
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-utopic-armhf-ci/24

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-system-compositor-ci/128/rebuild

review: Approve (continuous-integration)

[Robert Carr (robertcarr)]

LGTM

review: Approve

=== modified file 'src/powerd_mediator.cpp'
--- src/powerd_mediator.cpp	2014-06-25 14:43:36 +0000
+++ src/powerd_mediator.cpp	2014-07-01 17:14:48 +0000
@@ -187,22 +187,14 @@
     backlight_state = new_state;
 }
 
-void PowerdMediator::set_sys_state_for(MirPowerMode mode)
-{
-    if (mode == MirPowerMode::mir_power_mode_off)
-        release_sys_state();
-    else
-        acquire_sys_state();
-}
-
-void PowerdMediator::release_sys_state()
+void PowerdMediator::allow_suspend()
 {
     if (acquired_sys_state)
         powerd_interface->call("clearSysState", sys_state_cookie);
     acquired_sys_state = false;
 }
 
-void PowerdMediator::acquire_sys_state()
+void PowerdMediator::disable_suspend()
 {
     if (!acquired_sys_state)
     {
 
=== modified file 'src/powerd_mediator.h'
--- src/powerd_mediator.h	2014-06-24 22:28:12 +0000
+++ src/powerd_mediator.h	2014-07-01 17:14:48 +0000
@@ -42,7 +42,8 @@
     void set_dim_backlight();
     void set_normal_backlight();
     void turn_off_backlight();
-    void set_sys_state_for(MirPowerMode mode);
+    void allow_suspend();
+    void disable_suspend();
 
     void change_backlight_values(int dim_brightness, int normal_brightness);
     void enable_auto_brightness(bool flag);
@@ -65,8 +66,6 @@
         automatic
     };
     void change_backlight_state(BacklightState state);
-    void release_sys_state();
-    void acquire_sys_state();
     void init_brightness_params();
 
     int dim_brightness;
 
=== modified file 'src/screen_state_handler.cpp'
--- src/screen_state_handler.cpp	2014-06-23 16:28:06 +0000
+++ src/screen_state_handler.cpp	2014-07-01 17:14:48 +0000
@@ -148,9 +148,17 @@
     );
 
     compositor->stop();
+
+    bool const power_on = mode == MirPowerMode::mir_power_mode_on;
+    if (power_on)
+    {
+        //Some devices do not turn screen on properly from suspend mode
+        powerd_mediator->disable_suspend();
+    }
+
     display->configure(*displayConfig.get());
 
-    if (mode == MirPowerMode::mir_power_mode_on)
+    if (power_on)
     {
         compositor->start();
         powerd_mediator->set_normal_backlight();
@@ -161,8 +169,11 @@
     }
 
     current_power_mode = mode;
-    powerd_mediator->set_sys_state_for(mode);
+
     dbus_screen->emit_power_state_change(mode, reason);
+
+    if (!power_on)
+        powerd_mediator->allow_suspend();
 }
 
 void ScreenStateHandler::cancel_timers_l()