From: SooChan Lim <sc1.lim@samsung.com>
Date: Mon, 20 Nov 2017 12:56:11 +0000 (+0900)
Subject: e_comp_screen: turn off the hwc policy when the deactive is set.
X-Git-Tag: submit/tizen/20171127.014924~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e580c6714ad3aa9945e6c49b397f6eb2c48c992f;p=platform%2Fupstream%2Fenlightenment.git

e_comp_screen: turn off the hwc policy when the deactive is set.

When the deactive is set,
1. make the composite mode(E_OUTPUT_HWC_MODE_NO)
2. do not apply the hwc policy

Change-Id: Iae12aeaa4b298088470611b21ded11712b9903b3
---

diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c
index 9c60f6c393..07325b40c5 100644
--- a/src/bin/e_comp.c
+++ b/src/bin/e_comp.c
@@ -1253,7 +1253,7 @@ e_comp_hwc_deactive_set(Eina_Bool set)
    output = e_comp_screen_primary_output_get(e_comp->e_comp_screen);
    EINA_SAFETY_ON_NULL_RETURN(output);
 
-   e_output_hwc_deactive_set(output->output_hwc, EINA_TRUE);
+   e_output_hwc_deactive_set(output->output_hwc, set);
 }
 
 /* get the deactive value to the only primary output */
diff --git a/src/bin/e_info_server.c b/src/bin/e_info_server.c
index 4926069a0d..d367a33148 100644
--- a/src/bin/e_info_server.c
+++ b/src/bin/e_info_server.c
@@ -3972,10 +3972,7 @@ e_info_server_cb_hwc(const Eldbus_Service_Interface *iface EINA_UNUSED, const El
    if (onoff == 1)
      e_comp_hwc_deactive_set(EINA_FALSE);
    else if (onoff == 0)
-     {
-        e_comp_hwc_end("in runtime by e_info..");
-        e_comp_hwc_deactive_set(EINA_TRUE);
-     }
+     e_comp_hwc_deactive_set(EINA_TRUE);
 
    return reply;
 }
diff --git a/src/bin/e_output_hwc.c b/src/bin/e_output_hwc.c
index dae3df8757..8e7c98a99e 100644
--- a/src/bin/e_output_hwc.c
+++ b/src/bin/e_output_hwc.c
@@ -663,6 +663,13 @@ e_output_hwc_apply(E_Output_Hwc *output_hwc)
    EINA_SAFETY_ON_NULL_RETURN(output_hwc);
    EINA_SAFETY_ON_NULL_RETURN(output_hwc->output);
 
+   if (e_output_hwc_deactive_get(output_hwc))
+     {
+        if (output_hwc->hwc_mode != E_OUTPUT_HWC_MODE_NO)
+          e_output_hwc_end(output_hwc, "deactive set.");
+        return;
+     }
+
    if (!_e_output_hwc_usable(output_hwc))
      {
         e_output_hwc_end(output_hwc, __FUNCTION__);