Merge branch 'two-screen-coordinates' into nextnext-all

Conflicts:
	hw/xfree86/common/xf86Xinput.c

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

1 files changed, 2 insertions, 0 deletions

diff --git a/dix/dispatch.c b/dix/dispatch.c
index 192c8c34e..a644c5c58 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -3911,6 +3911,8 @@ AddScreen(
 	return -1;
     }
 
+    update_desktop_dimensions();
+
     dixRegisterPrivateKey(&cursorScreenDevPriv[i], PRIVATE_CURSOR, 0);
 
     return i;