- 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).

1 files changed, 2 insertions, 4 deletions

diff --git a/hw/kdrive/mga/mga.h b/hw/kdrive/mga/mga.h
index 3b3462063..979702e57 100644
--- a/hw/kdrive/mga/mga.h
+++ b/hw/kdrive/mga/mga.h
@@ -100,9 +100,10 @@ typedef struct _mgaCardInfo {
 typedef struct _mgaScreenInfo {
     VesaScreenPrivRec vesa;
 
+    KaaScreenInfoRec kaa;
+
     int pitch;
     int pw;
-    
 } MgaScreenInfo;
 
 #define getMgaScreenInfo(kd) ((MgaScreenInfo *) ((kd)->screen->driver))
@@ -134,9 +135,6 @@ void
 mgaDrawEnable (ScreenPtr pScreen);
 
 void
-mgaDrawSync (ScreenPtr pScreen);
-
-void
 mgaDrawDisable (ScreenPtr pScreen);
 
 void