xserver/hw/kdrive/neomagic README, NONE, 1.1 ChangeLog, 1.7, 1.8 neo_draw.c, 1.7, 1.8 neomagic.c, 1.8, 1.9

[Franco Catrin L.]

Committed by: fcatrin

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

Modified Files:
	ChangeLog neo_draw.c neomagic.c 
Added Files:
	README 
Log Message:
small fixes.  README added

--- NEW FILE: README ---
Neomagic KDrive driver for xserver

This is a very simple implementation for Neomagic based cards.
Almost all functions are handled by the VESA driver, and
only solid drawing and bitblt are done with acceleration,

This driver has been tested in MagicGraph 256AV+(NM2230) card
but it should work on other cards as well.

The only warning is to choose a working mode.  You can ask
for supported modes using -listmodes.  I use -mode 0x117.

--
Franco Catrin L.
fcatrin at tuxpan.com

Index: ChangeLog
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/neomagic/ChangeLog,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- a/ChangeLog	11 Apr 2004 16:39:48 -0000	1.7
+++ b/ChangeLog	7 Jun 2004 05:05:10 -0000	1.8
@@ -1,3 +1,6 @@
+2004-06-07 Franco Catrin L. <fcatrin at tuxpan.com>
+        * Small fix for depth calculation
+
 2004-04-11 Franco Catrin L. <fcatrin at tuxpan.com>
 
         * Basic bitblt implementation

Index: neo_draw.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/neomagic/neo_draw.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- a/neo_draw.c	11 Apr 2004 16:24:03 -0000	1.7
+++ b/neo_draw.c	7 Jun 2004 05:05:10 -0000	1.8
@@ -108,6 +108,7 @@
     mmio->dstStart = y * screen->pitch + x * screen->depth;
 
     mmio->xyExt    = (unsigned long)(h << 16) | (w & 0xffff);
+	
 }
 
 
@@ -139,7 +140,7 @@
 					NEO_BC0_DST_Y_DEC |
 					NEO_BC0_SRC_Y_DEC |
 					NEO_BC3_FIFO_EN |
-					NEO_BC3_SKIP_MAPPING |  0x0c0000;
+					NEO_BC3_SKIP_MAPPING |  rop;
 		srcX+=w-1;
 		dstX+=w-1;
 		srcY+=h-1;
@@ -168,15 +169,9 @@
 Bool neoDrawInit (ScreenPtr pScreen)
 {
     ENTER();
-//    SetupNeo(pScreen);
-//    PictureScreenPtr    ps = GetPictureScreen(pScreen);
-
     if (!kaaDrawInit (pScreen, &neoKaa)) {
         return FALSE;
     }
-
-//    if (ps && tridents->off_screen)
-//    ps->Composite = tridentComposite;
     LEAVE();
     return TRUE;
 }
@@ -188,7 +183,7 @@
     screen = neos;
     card = neoc;
     mmio = neoc->mmio;
-    screen->depth = screen->backendScreen.mode.BitsPerPixel/8;
+    screen->depth = (screen->backendScreen.mode.BitsPerPixel+7)/8;
     screen->pitch = screen->backendScreen.mode.BytesPerScanLine;
     DBGOUT("NEO depth=%x, pitch=%x\n", screen->depth, screen->pitch);
     LEAVE();

Index: neomagic.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/neomagic/neomagic.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- a/neomagic.c	11 Apr 2004 00:53:10 -0000	1.8
+++ b/neomagic.c	7 Jun 2004 05:05:10 -0000	1.9
@@ -300,6 +300,11 @@
 #define neoCursorDisable 0    // disableCursor
 #define neoCursorFini 0       // finiCursor */
 #define neoRecolorCursor 0    // recolorCursor */
+//#define     neoDrawInit 0              // initAccel
+//#define     neoDrawEnable 0            // enableAccel
+//#define     neoDrawSync 0          // syncAccel
+//#define     neoDrawDisable 0          // disableAccel
+//#define     neoDrawFini 0             // finiAccel
 
 KdCardFuncs    neoFuncs = {
     neoCardInit,              // cardinit