From 2d069b1d1950b5f6f9140e5573e349e6559251e6 Mon Sep 17 00:00:00 2001
From: Eric Anholt <anholt@freebsd.org>
Date: Sun, 12 Sep 2004 22:21:12 +0000
Subject: [PATCH] Move the RegisterBlockAndWakeupHandlers to before DRI
 initialization. The     change to use that instead of manual wrapping made
 the DMA dispatch     come after the lock had been dropped, causing lots of
 pain.

---
 hw/kdrive/ati/ati_draw.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hw/kdrive/ati/ati_draw.c b/hw/kdrive/ati/ati_draw.c
index 91d3f954f..a3d9d9d04 100644
--- a/hw/kdrive/ati/ati_draw.c
+++ b/hw/kdrive/ati/ati_draw.c
@@ -695,6 +695,9 @@ ATIDrawInit(ScreenPtr pScreen)
 	ErrorF("Screen: %d/%d depth/bpp\n", pScreenPriv->screen->fb[0].depth,
 	    pScreenPriv->screen->fb[0].bitsPerPixel);
 
+	RegisterBlockAndWakeupHandlers(ATIBlockHandler, ATIWakeupHandler,
+	    pScreen);
+
 #ifdef USE_DRI
 	atis->using_dri = ATIDRIScreenInit(pScreen);
 #endif /* USE_DRI */
@@ -800,9 +803,6 @@ ATIDrawEnable(ScreenPtr pScreen)
 	} else
 		atis->kaa.UploadToScratch = NULL;
 
-	RegisterBlockAndWakeupHandlers (ATIBlockHandler, ATIWakeupHandler,
-				       pScreen);
-
 	KdMarkSync(pScreen);
 }