diff options
| author | Thomas Hellstrom <thellstrom@vmware.com> | 2014-04-10 14:05:24 +0200 |
|---|---|---|
| committer | Thomas Hellstrom <thellstrom@vmware.com> | 2014-04-11 12:35:11 +0200 |
| commit | 1ed14687a3f1092db8504fb9cf4f446451801665 (patch) | |
| tree | 5792cab39572c991b7b98eec55585372ddd87064 | |
| parent | 64e0faf1480663a990e0f6aeef7af0e69845af49 (diff) | |
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>
| -rw-r--r-- | vmwgfx/vmwgfx_xmir.c | 6 |
1 files changed, 6 insertions, 0 deletions
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; } |