xserver/hw/kdrive/ati ati_draw.c,1.22,1.23

[Eric Anholt]

Committed by: anholt

Update of /cvs/xserver/xserver/hw/kdrive/ati
In directory gabe:/tmp/cvs-serv16874/hw/kdrive/ati

Modified Files:
	ati_draw.c 
Log Message:
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.


Index: ati_draw.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/ati/ati_draw.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- ati_draw.c	12 Sep 2004 20:19:15 -0000	1.22
+++ ati_draw.c	12 Sep 2004 22:21:12 -0000	1.23
@@ -695,6 +695,9 @@
 	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 @@
 	} else
 		atis->kaa.UploadToScratch = NULL;
 
-	RegisterBlockAndWakeupHandlers (ATIBlockHandler, ATIWakeupHandler,
-				       pScreen);
-
 	KdMarkSync(pScreen);
 }