xserver/hw/kdrive/neomagic backend.c, 1.3.2.1, 1.3.2.2 neomagic.c, 1.5.2.1, 1.5.2.2

[Brent Cook]

Committed by: busterb

Update of /cvs/xserver/xserver/hw/kdrive/neomagic
In directory pdx:/tmp/cvs-serv1265

Modified Files:
      Tag: bcook-backend
	backend.c neomagic.c 
Log Message:
Some little debugging additions; this works well with my NM2200 when
acceleration is turned off in fbdev mode, but hangs when acceleration is on.
Will merge this with HEAD and debug from there, since backend seems in good
shape.


Index: backend.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/neomagic/backend.c,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -d -r1.3.2.1 -r1.3.2.2
--- a/backend.c	8 Apr 2004 04:26:01 -0000	1.3.2.1
+++ b/backend.c	12 Apr 2004 02:23:11 -0000	1.3.2.2
@@ -22,6 +22,7 @@
 #ifdef KDRIVEFBDEV
     if (!success && fbdevInitialize(card, &backend->priv.fbdev)) {
         success = TRUE;
+        ErrorF("Using fbdev backend\n");
         backend->type = FBDEV;
         backend->cardfini = fbdevCardFini;
         backend->scrfini = fbdevScreenFini;
@@ -40,6 +41,7 @@
 #ifdef KDRIVEVESA
     if (!success && vesaInitialize(card, &backend->priv.vesa)) {
         success = TRUE;
+        ErrorF("Using vesa backend\n");
         backend->type = VESA;
         backend->cardfini = vesaCardFini;
         backend->scrfini = vesaScreenFini;

Index: neomagic.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/neomagic/neomagic.c,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -d -r1.5.2.1 -r1.5.2.2
--- a/neomagic.c	8 Apr 2004 04:26:01 -0000	1.5.2.1
+++ b/neomagic.c	12 Apr 2004 02:23:11 -0000	1.5.2.2
@@ -100,6 +100,8 @@
         return FALSE;
     }
 
+    screen->driver = neos;
+
     if(!backendScreenInitialize(screen, &neos->backendScreen, &neoc->backendCard)) {
         xfree(neos);
         return FALSE;
@@ -136,8 +138,6 @@
         neos->off_screen_size = 0;
     }
 
-    screen->driver = neos;
-
     LEAVE();
     return TRUE;
 }
@@ -149,8 +149,8 @@
     KdScreenPriv(pScreen);
     neoCardInfo(pScreenPriv);
     
-    return neoc->backendCard.initScreen(pScreen);
     LEAVE();
+    return neoc->backendCard.initScreen(pScreen);
 }
 
 static Bool