From 20a6f974f413757da649dcc984fd6c759096dd54 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>

Date: Sun, 1 Sep 2013 23:14:43 +0200

Subject: [PATCH 16/30] xwayland: Probe outputs on preinit

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

When running xwayland, calls to xf86SetDesiredModes() would fail due to

the probed modes list not being populated. This was previously done

indirectly by calling xf86InitialConfiguration() and now needs to be

done explicitly instead.

Signed-off-by: Jonas Ã…dahl <jadahl@gmail.com>

---

 hw/xfree86/xwayland/xwayland-output.c | 2 ++

 1 file changed, 2 insertions(+)

diff --git a/hw/xfree86/xwayland/xwayland-output.c b/hw/xfree86/xwayland/xwayland-output.c

index 66c7d48..691b5f0 100644

--- a/hw/xfree86/xwayland/xwayland-output.c

+++ b/hw/xfree86/xwayland/xwayland-output.c

@@ -431,6 +431,8 @@ xwayland_screen_preinit_output(struct xwl_screen *xwl_screen, ScrnInfoPtr scrnin

             FatalError("failed to dispatch Wayland events: %s\n", strerror(errno));

     }

+    xf86ProbeOutputModes(scrninfo, 0, 0);

+

     xwl_screen->outputs_initialized = TRUE;

     xf86SetScrnInfoModes(scrninfo);

-- 

1.8.3.1