From 1ed14687a3f1092db8504fb9cf4f446451801665 Mon Sep 17 00:00:00 2001
From: Thomas Hellstrom <thellstrom@vmware.com>
Date: Thu, 10 Apr 2014 14:05:24 +0200
Subject: vmware/vmwgfx: Set desired modes after xMir screen init

While XMir does initial mode configuration, it leaves setting initial
modes to the DDX driver.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
---
 vmwgfx/vmwgfx_xmir.c | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'vmwgfx')

diff --git a/vmwgfx/vmwgfx_xmir.c b/vmwgfx/vmwgfx_xmir.c
index ede6753..89dbaf3 100644
--- a/vmwgfx/vmwgfx_xmir.c
+++ b/vmwgfx/vmwgfx_xmir.c
@@ -36,6 +36,7 @@
 
 #include "vmwgfx_hosted.h"
 #include "vmwgfx_saa.h"
+#include <xf86Crtc.h>
 #include <xf86Priv.h>
 #include <xmir.h>
 
@@ -103,6 +104,11 @@ vmwgfx_xmir_screen_init(struct vmwgfx_hosted *hosted, ScreenPtr pScreen)
 	return FALSE;
 
     hosted->pScreen = pScreen;
+    if (!xf86SetDesiredModes(hosted->pScrn)) {
+	xmir_screen_close(hosted->pScreen, hosted->xmir);
+	hosted->pScreen = NULL;
+	return FALSE;
+    }
 
     return TRUE;
 }
-- 
cgit v1.2.3