From: Chris Michael <cp.michael@samsung.com>
Date: Thu, 14 May 2015 12:38:13 +0000 (-0400)
Subject: wl-drm: Don't enable/disable an output until after we have set the current mode
X-Git-Tag: upstream/0.20.0~847
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=40b877f527b2a43d711c4acf073f3a62cf9bc9e1;p=platform%2Fupstream%2Fenlightenment.git

wl-drm: Don't enable/disable an output until after we have set the current mode

Signed-off-by: Chris Michael <cp.michael@samsung.com>
---

diff --git a/src/modules/wl_drm/e_mod_main.c b/src/modules/wl_drm/e_mod_main.c
index cba2b20..668fe43 100644
--- a/src/modules/wl_drm/e_mod_main.c
+++ b/src/modules/wl_drm/e_mod_main.c
@@ -546,13 +546,11 @@ _drm_randr_apply(void)
                   if (s->config.enabled)
                     {
                        printf("\tDRM RRR: Enabled\n");
-                       ecore_drm_output_enable(out);
                        mode = _e_mod_drm_mode_screen_find(s, out);
                     }
                   else
                     {
                        printf("\tDRM RRR: Disabled\n");
-                       ecore_drm_output_disable(out);
                     }
 
                   if (s->config.priority > top_priority)
@@ -586,6 +584,11 @@ _drm_randr_apply(void)
                   if (s->config.priority == top_priority)
                     ecore_drm_output_primary_set(out);
 
+                  if (s->config.enabled)
+                    ecore_drm_output_enable(out);
+                  else
+                    ecore_drm_output_disable(out);
+
                   printf("\tDRM RRR: Mode\n");
                   printf("\t\tDRM RRR: Geom: %d %d\n",
                          s->config.mode.w, s->config.mode.h);