e_comp_screen: deactive hwc after e_display_init()

HWC initializes at e_display_init, so hwc deactivation has
done after e_display_init.

Change-Id: I1a7f7b2e3bcfad2840d09f235e9d48f6f87efa34

diff --git a/src/bin/compmgr/e_comp.c b/src/bin/compmgr/e_comp.c
index 359b536..f106e83 100644 (file)
--- a/src/bin/compmgr/e_comp.c
+++ b/src/bin/compmgr/e_comp.c
@@ -331,7 +331,6 @@ e_comp_init(void)
 
    if (e_comp->hwc)
      {
-        if (conf->hwc_deactive) e_comp_hwc_deactive_set(EINA_TRUE);
         if (conf->hwc_reuse_cursor_buffer) e_comp->hwc_reuse_cursor_buffer = EINA_TRUE;
 
         if (conf->hwc_use_multi_plane) e_comp_hwc_multi_plane_set(EINA_TRUE);
@@ -1612,3 +1611,11 @@ e_comp_ungrab_input_without_inout(Eina_Bool mouse, Eina_Bool kbd)
 
    e_zone_focus_reset(zone);
 }
+
+EINTERN Eina_Bool
+e_comp_conf_hwc_deactive_get(void)
+{
+   if (!conf) return EINA_FALSE;
+
+   return conf->hwc_deactive;
+}
\ No newline at end of file

diff --git a/src/bin/compmgr/e_comp_intern.h b/src/bin/compmgr/e_comp_intern.h
index 64e0d43..65fe932 100644 (file)
--- a/src/bin/compmgr/e_comp_intern.h
+++ b/src/bin/compmgr/e_comp_intern.h
@@ -55,4 +55,6 @@ EINTERN Eina_Bool     e_comp_visibility_calculation_get(void);
 EINTERN E_Client     *e_comp_focused_ec_get(void);
 EINTERN void          e_comp_ungrab_input_without_inout(Eina_Bool mouse, Eina_Bool kbd);
 
+EINTERN Eina_Bool     e_comp_conf_hwc_deactive_get(void);
+
 #endif

diff --git a/src/bin/e_comp_screen.c b/src/bin/e_comp_screen.c
index 5ccffc6..a1a41e1 100644 (file)
--- a/src/bin/e_comp_screen.c
+++ b/src/bin/e_comp_screen.c
@@ -395,6 +395,9 @@ _e_comp_screen_new(E_Comp *comp)
 
    e_comp_screen->num_outputs = e_display_num_outputs_get();
    e_comp_screen->outputs = e_display_outputs_get();
+
+   if (e_comp->hwc && e_comp_conf_hwc_deactive_get())
+     e_comp_hwc_deactive_set(EINA_TRUE);
 #else
    /* tdm display init */
    e_main_ts_begin("\tTDM Display Init");