xserver/hw/kdrive/nvidia nvidia.c, 1.2, 1.3 nvidia.h, 1.2, 1.3 nvidiadraw.c, 1.3, 1.4

Committed by: anholt

Update of /cvs/xserver/xserver/hw/kdrive/nvidia
In directory gabe:/tmp/cvs-serv30863/hw/kdrive/nvidia

Modified Files:
	nvidia.c nvidia.h nvidiadraw.c 
Log Message:
- Replace the syncAccel hook in the kdrive structure with a pair of
  hooks in the kaa structure: markSync and waitMarker.  The first, if
  set, returns a hardware-dependent marker number which can then be
  waited for with waitMarker.  If markSync is absent (which is the case
  on all drivers currently), waitMarker must wait for idle on any given
  marker number.  The intention is to allow for more parallelism when
  we get downloading from framebuffer, or more fine-grained idling.
- Replace the KdMarkSync/KdCheckSync functions with kaaMarkSync and
  kaaWaitSync.  These will need to be refined when KAA starts being
  smart about using them.  Merge kpict.c into kasync.c since kasyn.c has
  all the rest of these fallback funcs.
- Restructure all drivers to initialize a KaaInfo structure by hand
  rather than statically in dubious order.
- Whack the i810 driver into shape in hopes that it'll work after this
  change (it certainly wouldn't have before this).  Doesn't support my
  i845 though.
- Make a new KXV helper to avoid duplicated code to fill the region
  with the necessary color key.  Use it in i810 and mach64 (tested).


Index: nvidia.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/nvidia/nvidia.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- nvidia.c	2 Nov 2003 19:56:10 -0000	1.2
+++ nvidia.c	9 Jun 2005 10:44:45 -0000	1.3
@@ -117,7 +117,7 @@
 		      int		rate,
 		      RRScreenSizePtr	pSize)
 {
-    KdCheckSync (pScreen);
+    kaaWaitSync (pScreen);
 
     if (!vesaRandRSetConfig (pScreen, rotation, rate, pSize))
 	return FALSE;
@@ -354,7 +354,6 @@
     
     nvidiaDrawInit,	    /* initAccel */
     nvidiaDrawEnable,	    /* enableAccel */
-    nvidiaDrawSync,	    /* syncAccel */
     nvidiaDrawDisable,	    /* disableAccel */
     nvidiaDrawFini,	    /* finiAccel */
     

Index: nvidia.h
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/nvidia/nvidia.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- nvidia.h	2 Nov 2003 19:56:10 -0000	1.2
+++ nvidia.h	9 Jun 2005 10:44:45 -0000	1.3
@@ -160,6 +160,7 @@
     CARD8			*off_screen;
     int				off_screen_size;
     KdVideoAdaptorPtr		pAdaptor;
+    KaaScreenInfoRec		kaa;
 } NvidiaScreenInfo;
 
 #define getNvidiaScreenInfo(kd) ((NvidiaScreenInfo *) ((kd)->screen->driver))
@@ -217,9 +218,6 @@
 nvidiaDrawEnable (ScreenPtr pScreen);
 
 void
-nvidiaDrawSync (ScreenPtr pScreen);
-
-void
 nvidiaDrawDisable (ScreenPtr pScreen);
 
 void

Index: nvidiadraw.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/nvidia/nvidiadraw.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- nvidiadraw.c	2 Nov 2003 19:56:10 -0000	1.3
+++ nvidiadraw.c	9 Jun 2005 10:44:45 -0000	1.4
@@ -40,6 +40,7 @@
 #include	"migc.h"
 #include	"miline.h"
 #include	"picturestr.h"
+#include	"kaa.h"
 
 CARD8 nvidiaRop[16] = {
     /* GXclear      */      0x01,         /* 0 */
@@ -81,6 +82,15 @@
     }
 }
 
+static void
+nvidiaWaitMarker (ScreenPtr pScreen, int marker)
+{
+    KdScreenPriv(pScreen);
+    nvidiaCardInfo(pScreenPriv);
+    
+    nvidiaWaitIdle (nvidiac);
+}
+
 static Bool
 nvidiaPrepareSolid (PixmapPtr   pPixmap,
 		    int		alu,
@@ -154,27 +164,27 @@
 {
 }
 
-KaaScreenInfoRec    nvidiaKaa = {
-    nvidiaPrepareSolid,
-    nvidiaSolid,
-    nvidiaDoneSolid,
-
-    nvidiaPrepareCopy,
-    nvidiaCopy,
-    nvidiaDoneCopy,
-};
-
 Bool
 nvidiaDrawInit (ScreenPtr pScreen)
 {
     KdScreenPriv(pScreen);
     nvidiaCardInfo(pScreenPriv);
+    nvidiaScreenInfo(pScreenPriv);
     Bool    ret = TRUE;
     
     ENTER ();
     if (pScreenPriv->screen->fb[0].depth == 4)
 	ret = FALSE;
     
+    memset(&nvidias->kaa, 0, sizeof(KaaScreenInfoRec));
+    nvidias->kaa.waitMarker	= nvidiaWaitMarker;
+    nvidias->kaa.PrepareSolid	= nvidiaPrepareSolid;
+    nvidias->kaa.Solid		= nvidiaSolid;
+    nvidias->kaa.DoneSolid	= nvidiaDoneSolid;
+    nvidias->kaa.PrepareCopy	= nvidiaPrepareCopy;
+    nvidias->kaa.Copy		= nvidiaCopy;
+    nvidias->kaa.DoneCopy	= nvidiaDoneCopy;
+
     if (ret && !nvidiac->rop)
     {
 	ErrorF ("Failed to map fifo registers\n");
@@ -185,7 +195,7 @@
 	ErrorF ("Fifo appears broken\n");
 	ret = FALSE;
     }
-    if (ret && !kaaDrawInit (pScreen, &nvidiaKaa))
+    if (ret && !kaaDrawInit (pScreen, &nvidias->kaa))
     {
 	ErrorF ("kaaDrawInit failed\n");
 	ret = FALSE;
@@ -215,7 +225,7 @@
     ENTER ();
     nvidiac->fifo_size = nvidiac->rop->FifoFree.FifoFree;
     nvidiac->fifo_free = 0;
-    KdMarkSync (pScreen);
+    kaaMarkSync (pScreen);
     LEAVE ();
 }
 
@@ -229,11 +239,3 @@
 {
 }
 
-void
-nvidiaDrawSync (ScreenPtr pScreen)
-{
-    KdScreenPriv(pScreen);
-    nvidiaCardInfo(pScreenPriv);
-    
-    nvidiaWaitIdle (nvidiac);
-}