xserver ChangeLog,3.332,3.333
Eric Anholt <xserver-commit-u7BhqnqprCWvj1b/[email protected]> Thu, 9 Jun 2005 03:44:46 -0700 (PDT)
| Newsgroups | gmane.comp.freedesktop.xserver.cvs |
|---|---|
| Message-ID | <[email protected]> |
Committed by: anholt Update of /cvs/xserver/xserver In directory gabe:/tmp/cvs-serv30863 Modified Files: ChangeLog 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: ChangeLog =================================================================== RCS file: /cvs/xserver/xserver/ChangeLog,v retrieving revision 3.332 retrieving revision 3.333 diff -u -d -r3.332 -r3.333 --- ChangeLog 7 Jun 2005 16:04:36 -0000 3.332 +++ ChangeLog 9 Jun 2005 10:44:44 -0000 3.333 @@ -1,3 +1,100 @@ + +2005-06-09 Eric Anholt <[email protected]> + + * hw/kdrive/chips/chips.c: (chipsRandRSetConfig): + * hw/kdrive/chips/chips.h: + * hw/kdrive/chips/chipsdraw.c: (chipsWaitMarker), (chipsDrawInit), + (chipsDrawEnable): + * hw/kdrive/epson/epson13806.c: + * hw/kdrive/epson/epson13806.h: + * hw/kdrive/epson/epson13806draw.c: (epsonWaitMarker), + (epsonDrawInit), (epsonDrawEnable): + * hw/kdrive/fake/fakeinit.c: + * hw/kdrive/i810/i810.c: (i810FinishInitScreen), + (i810AllocateGARTMemory), (i810AllocLow), (i810AllocHigh), + (i810ScreenInit), (DoSave), (i810Preserve), (i810PrintErrorState), + (i810VGAInit), (i810GetColors), (i810PutColors): + * hw/kdrive/i810/i810.h: + * hw/kdrive/i810/i810_video.c: (i810PutImage): + * hw/kdrive/i810/i810draw.c: (i810WaitLpRing), (i810Sync), + (i810WaitMarker), (i810EmitInvarientState), (i810PrepareSolid), + (i810Solid), (i810DoneSolid), (i810PrepareCopy), (i810RefreshRing), + (i810SetRingRegs), (i810InitAccel), (i810EnableAccel), + (i810DisableAccel), (i810FiniAccel): + * hw/kdrive/i810/i810stub.c: (InitCard), (ddxProcessArgument): + * hw/kdrive/mach64/mach64.c: (mach64RandRSetConfig), (mach64DPMS): + * hw/kdrive/mach64/mach64.h: + * hw/kdrive/mach64/mach64draw.c: (mach64WaitMarker), + (mach64DrawInit), (mach64DrawEnable), (mach64DrawFini): + * hw/kdrive/mach64/mach64stub.c: (InitCard): + * hw/kdrive/mach64/mach64video.c: (mach64PutImage), + (mach64ReputImage): + * hw/kdrive/mga/mga.c: + * hw/kdrive/mga/mga.h: + * hw/kdrive/mga/mgadraw.c: (mgaWaitMarker), (mgaDrawInit), + (mgaDrawEnable): + * hw/kdrive/nvidia/nvidia.c: (nvidiaRandRSetConfig): + * hw/kdrive/nvidia/nvidia.h: + * hw/kdrive/nvidia/nvidiadraw.c: (nvidiaWaitMarker), + (nvidiaDrawInit), (nvidiaDrawEnable): + * hw/kdrive/pm2/pm2.c: (pmRandRSetConfig): + * hw/kdrive/pm2/pm2.h: + * hw/kdrive/pm2/pm2_draw.c: (pmWaitMarker), (pmDrawInit), + (pmDrawEnable), (pmDrawFini): + * hw/kdrive/r128/r128.c: + * hw/kdrive/r128/r128.h: + * hw/kdrive/r128/r128draw.c: (r128WaitMarker), (r128DrawInit), + (r128DrawEnable), (r128DrawFini): + * hw/kdrive/smi/smi.c: (smiRandRSetConfig): + * hw/kdrive/smi/smi.h: + * hw/kdrive/smi/smidraw.c: (smiWaitMarker), (smiDrawInit), + (smiDrawEnable), (smiDrawFini): + * hw/kdrive/src/Makefile.am: + * hw/kdrive/src/kaa.c: (kaaPixmapSave), (kaaPixmapAllocArea), + (kaaMoveInPixmap), (kaaFillSpans), (kaaCopyNtoN), + (kaaPolyFillRect), (kaaSolidBoxClipped), (kaaImageGlyphBlt), + (kaaFillRegionSolid): + * hw/kdrive/src/kaa.h: + * hw/kdrive/src/kaapict.c: (kaaTryDriverSolidFill), + (kaaTryDriverBlend), (kaaTryDriverComposite): + * hw/kdrive/src/kasync.c: (KdCheckFillSpans), (KdCheckSetSpans), + (KdCheckPutImage), (KdCheckCopyArea), (KdCheckCopyPlane), + (KdCheckPolyPoint), (KdCheckPolylines), (KdCheckPolySegment), + (KdCheckPolyRectangle), (KdCheckPolyArc), (KdCheckFillPolygon), + (KdCheckPolyFillRect), (KdCheckPolyFillArc), + (KdCheckImageGlyphBlt), (KdCheckPolyGlyphBlt), (KdCheckPushPixels), + (KdCheckGetImage), (KdCheckGetSpans), (KdCheckSaveAreas), + (KdCheckRestoreAreas), (KdCheckPaintWindow), (KdCheckCopyWindow), + (KdCheckPaintKey), (KdCheckOverlayCopyWindow), (KdCheckComposite), + (KdCheckRasterizeTrapezoid), (KdPictureInitAsync): + * hw/kdrive/src/kdrive.c: (KdDisableScreen): + * hw/kdrive/src/kdrive.h: + * hw/kdrive/src/kpict.c: + * hw/kdrive/src/kxv.c: (KXVPaintRegion): + * hw/kdrive/src/kxv.h: + * hw/kdrive/via/via.c: + * hw/kdrive/via/via.h: + * hw/kdrive/via/viadraw.c: (viaWaitMarker), (viaDoneSolid), + (viaDoneCopy), (viaDrawInit), (viaDrawEnable), (viaDrawFini): + - 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). + 2005-06-07 David Reveman <[email protected]> * configure.ac: Add GLX includes to EXTENSION_INCS.