Revert "sna: Add XMir support"

This reverts commit 42d94356f65972eb7fb8991234a4e9388c4c2031.

Ordered-by: The Management.

1 files changed, 2 insertions, 17 deletions

diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c
index 46249987..4da6cbb0 100644
--- a/src/sna/sna_driver.c
+++ b/src/sna/sna_driver.c
@@ -443,9 +443,6 @@ static Bool sna_pre_init(ScrnInfoPtr scrn, int flags)
 		goto cleanup;
 	}
 
-	if (!sna_xmir_create(sna))
-		goto cleanup;
-
 	/* Sanity check */
 	if (hosted() && (sna->flags & SNA_IS_HOSTED) == 0) {
 		xf86DrvMsg(scrn->scrnIndex, X_ERROR,
@@ -453,14 +450,9 @@ static Bool sna_pre_init(ScrnInfoPtr scrn, int flags)
 		goto cleanup;
 	}
 
-	if (sna->xmir) {
-		/* XXX query depth from xmir */
+	preferred_depth = sna->info->gen < 030 ? 15 : 24;
+	if (!fb_supports_depth(fd, preferred_depth))
 		preferred_depth = 24;
-	} else {
-		preferred_depth = sna->info->gen < 030 ? 15 : 24;
-		if (!fb_supports_depth(fd, preferred_depth))
-			preferred_depth = 24;
-	}
 
 	if (!xf86SetDepthBpp(scrn, preferred_depth, 0, 0,
 			     Support32bppFb |
@@ -497,9 +489,6 @@ static Bool sna_pre_init(ScrnInfoPtr scrn, int flags)
 
 	intel_detect_chipset(scrn, sna->pEnt, sna->PciInfo);
 
-	if (!sna_xmir_pre_init(sna))
-		goto cleanup;
-
 	kgem_init(&sna->kgem, fd, sna->PciInfo, sna->info->gen);
 	if (xf86ReturnOptValBool(sna->Options, OPTION_ACCEL_DISABLE, FALSE) ||
 	    !sna_option_cast_to_bool(sna, OPTION_ACCEL_METHOD, TRUE)) {
@@ -585,8 +574,6 @@ sna_block_handler(BLOCKHANDLER_ARGS_DECL)
 
 	if (*tv == NULL || ((*tv)->tv_usec | (*tv)->tv_sec))
 		sna_accel_block_handler(sna, tv);
-
-	sna_xmir_post_damage(sna);
 }
 
 static void
@@ -936,8 +923,6 @@ sna_screen_init(SCREEN_INIT_ARGS_DECL)
 	if (!miDCInitialize(screen, xf86GetPointerScreenFuncs()))
 		return FALSE;
 
-	sna_xmir_init(sna, screen); /* after DirectCursor is initialised */
-
 	if ((sna->flags & SNA_IS_HOSTED) == 0 &&
 	    xf86_cursors_init(screen, SNA_CURSOR_X, SNA_CURSOR_Y,
 			       HARDWARE_CURSOR_TRUECOLOR_AT_8BPP |