Add UXA - the unified memory acceleration architecture.

This eliminates the cost of EXA migration management while providing full
pixmap allocation control to the driver. The goal is to make something
useful for UMA drivers.

1 files changed, 370 insertions, 0 deletions

diff --git a/uxa/uxa-unaccel.c b/uxa/uxa-unaccel.c
new file mode 100644
index 00000000..27194208
--- /dev/null
+++ b/uxa/uxa-unaccel.c
@@ -0,0 +1,370 @@
+/*
+ *
+ * Copyright © 1999 Keith Packard
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Keith Packard not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Keith Packard makes no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+ *
+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include "uxa-priv.h"
+
+#ifdef RENDER
+#include "mipict.h"
+#endif
+
+/*
+ * These functions wrap the low-level fb rendering functions and
+ * synchronize framebuffer/accelerated drawing by stalling until
+ * the accelerator is idle
+ */
+
+/**
+ * Calls uxa_prepare_access with UXA_PREPARE_SRC for the tile, if that is the
+ * current fill style.
+ *
+ * Solid doesn't use an extra pixmap source, and Stippled/OpaqueStippled are
+ * 1bpp and never in fb, so we don't worry about them.
+ * We should worry about them for completeness sake and going forward.
+ */
+void
+uxa_prepare_access_gc(GCPtr pGC)
+{
+    if (pGC->stipple)
+        uxa_prepare_access(&pGC->stipple->drawable, UXA_PREPARE_MASK);
+    if (pGC->fillStyle == FillTiled)
+	uxa_prepare_access(&pGC->tile.pixmap->drawable, UXA_PREPARE_SRC);
+}
+
+/**
+ * Finishes access to the tile in the GC, if used.
+ */
+void
+uxa_finish_access_gc(GCPtr pGC)
+{
+    if (pGC->fillStyle == FillTiled)
+	uxa_finish_access(&pGC->tile.pixmap->drawable, UXA_PREPARE_MASK);
+    if (pGC->stipple)
+        uxa_finish_access(&pGC->stipple->drawable, UXA_PREPARE_SRC);
+}
+
+#if DEBUG_TRACE_FALL
+char
+uxa_drawable_location(DrawablePtr pDrawable)
+{
+    return uxa_drawable_is_offscreen(pDrawable) ? 's' : 'm';
+}
+#endif /* DEBUG_TRACE_FALL */
+
+void
+uxa_check_fill_spans (DrawablePtr pDrawable, GCPtr pGC, int nspans,
+		   DDXPointPtr ppt, int *pwidth, int fSorted)
+{
+    UXA_FALLBACK(("to %p (%c)\n", pDrawable, uxa_drawable_location(pDrawable)));
+    uxa_prepare_access (pDrawable, UXA_PREPARE_DEST);
+    uxa_prepare_access_gc (pGC);
+    fbFillSpans (pDrawable, pGC, nspans, ppt, pwidth, fSorted);
+    uxa_finish_access_gc (pGC);
+    uxa_finish_access (pDrawable, UXA_PREPARE_DEST);
+}
+
+void
+uxa_check_set_spans (DrawablePtr pDrawable, GCPtr pGC, char *psrc,
+		 DDXPointPtr ppt, int *pwidth, int nspans, int fSorted)
+{
+    UXA_FALLBACK(("to %p (%c)\n", pDrawable, uxa_drawable_location(pDrawable)));
+    uxa_prepare_access (pDrawable, UXA_PREPARE_DEST);
+    fbSetSpans (pDrawable, pGC, psrc, ppt, pwidth, nspans, fSorted);
+    uxa_finish_access (pDrawable, UXA_PREPARE_DEST);
+}
+
+void
+uxa_check_put_image (DrawablePtr pDrawable, GCPtr pGC, int depth,
+		 int x, int y, int w, int h, int leftPad, int format,
+		 char *bits)
+{
+    UXA_FALLBACK(("to %p (%c)\n", pDrawable, uxa_drawable_location(pDrawable)));
+    uxa_prepare_access (pDrawable, UXA_PREPARE_DEST);
+    fbPutImage (pDrawable, pGC, depth, x, y, w, h, leftPad, format, bits);
+    uxa_finish_access (pDrawable, UXA_PREPARE_DEST);
+}
+
+RegionPtr
+uxa_check_copy_area (DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,
+		 int srcx, int srcy, int w, int h, int dstx, int dsty)
+{
+    RegionPtr ret;
+
+    UXA_FALLBACK(("from %p to %p (%c,%c)\n", pSrc, pDst,
+		  uxa_drawable_location(pSrc), uxa_drawable_location(pDst)));
+    uxa_prepare_access (pDst, UXA_PREPARE_DEST);
+    uxa_prepare_access (pSrc, UXA_PREPARE_SRC);
+    ret = fbCopyArea (pSrc, pDst, pGC, srcx, srcy, w, h, dstx, dsty);
+    uxa_finish_access (pSrc, UXA_PREPARE_SRC);
+    uxa_finish_access (pDst, UXA_PREPARE_DEST);
+
+    return ret;
+}
+
+RegionPtr
+uxa_check_copy_plane (DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,
+		  int srcx, int srcy, int w, int h, int dstx, int dsty,
+		  unsigned long bitPlane)
+{
+    RegionPtr ret;
+
+    UXA_FALLBACK(("from %p to %p (%c,%c)\n", pSrc, pDst,
+		  uxa_drawable_location(pSrc), uxa_drawable_location(pDst)));
+    uxa_prepare_access (pDst, UXA_PREPARE_DEST);
+    uxa_prepare_access (pSrc, UXA_PREPARE_SRC);
+    ret = fbCopyPlane (pSrc, pDst, pGC, srcx, srcy, w, h, dstx, dsty,
+		       bitPlane);
+    uxa_finish_access (pSrc, UXA_PREPARE_SRC);
+    uxa_finish_access (pDst, UXA_PREPARE_DEST);
+
+    return ret;
+}
+
+void
+uxa_check_poly_point (DrawablePtr pDrawable, GCPtr pGC, int mode, int npt,
+		  DDXPointPtr pptInit)
+{
+    UXA_FALLBACK(("to %p (%c)\n", pDrawable, uxa_drawable_location(pDrawable)));
+    uxa_prepare_access (pDrawable, UXA_PREPARE_DEST);
+    fbPolyPoint (pDrawable, pGC, mode, npt, pptInit);
+    uxa_finish_access (pDrawable, UXA_PREPARE_DEST);
+}
+
+void
+uxa_check_poly_lines (DrawablePtr pDrawable, GCPtr pGC,
+		  int mode, int npt, DDXPointPtr ppt)
+{
+    UXA_FALLBACK(("to %p (%c), width %d, mode %d, count %d\n",
+		  pDrawable, uxa_drawable_location(pDrawable),
+		  pGC->lineWidth, mode, npt));
+
+    if (pGC->lineWidth == 0) {
+	uxa_prepare_access (pDrawable, UXA_PREPARE_DEST);
+	uxa_prepare_access_gc (pGC);
+	fbPolyLine (pDrawable, pGC, mode, npt, ppt);
+	uxa_finish_access_gc (pGC);
+	uxa_finish_access (pDrawable, UXA_PREPARE_DEST);
+	return;
+    }
+    /* fb calls mi functions in the lineWidth != 0 case. */
+    fbPolyLine (pDrawable, pGC, mode, npt, ppt);
+}
+
+void
+uxa_check_poly_segment (DrawablePtr pDrawable, GCPtr pGC,
+		    int nsegInit, xSegment *pSegInit)
+{
+    UXA_FALLBACK(("to %p (%c) width %d, count %d\n", pDrawable,
+		  uxa_drawable_location(pDrawable), pGC->lineWidth, nsegInit));
+    if (pGC->lineWidth == 0) {
+	uxa_prepare_access (pDrawable, UXA_PREPARE_DEST);
+	uxa_prepare_access_gc (pGC);
+	fbPolySegment (pDrawable, pGC, nsegInit, pSegInit);
+	uxa_finish_access_gc (pGC);
+	uxa_finish_access (pDrawable, UXA_PREPARE_DEST);
+	return;
+    }
+    /* fb calls mi functions in the lineWidth != 0 case. */
+    fbPolySegment (pDrawable, pGC, nsegInit, pSegInit);
+}
+
+void
+uxa_check_poly_arc (DrawablePtr pDrawable, GCPtr pGC,
+		int narcs, xArc *pArcs)
+{
+    UXA_FALLBACK(("to %p (%c)\n", pDrawable, uxa_drawable_location(pDrawable)));
+
+    /* Disable this as fbPolyArc can call miZeroPolyArc which in turn
+     * can call accelerated functions, that as yet, haven't been notified
+     * with uxa_finish_access().
+     */
+#if 0
+    if (pGC->lineWidth == 0)
+    {
+	uxa_prepare_access (pDrawable, UXA_PREPARE_DEST);
+	uxa_prepare_access_gc (pGC);
+	fbPolyArc (pDrawable, pGC, narcs, pArcs);
+	uxa_finish_access_gc (pGC);
+	uxa_finish_access (pDrawable, UXA_PREPARE_DEST);
+	return;
+    }
+#endif
+    miPolyArc (pDrawable, pGC, narcs, pArcs);
+}
+
+void
+uxa_check_poly_fill_rect (DrawablePtr pDrawable, GCPtr pGC,
+		     int nrect, xRectangle *prect)
+{
+    UXA_FALLBACK(("to %p (%c)\n", pDrawable, uxa_drawable_location(pDrawable)));
+
+    uxa_prepare_access (pDrawable, UXA_PREPARE_DEST);
+    uxa_prepare_access_gc (pGC);
+    fbPolyFillRect (pDrawable, pGC, nrect, prect);
+    uxa_finish_access_gc (pGC);
+    uxa_finish_access (pDrawable, UXA_PREPARE_DEST);
+}
+
+void
+uxa_check_image_glyph_blt (DrawablePtr pDrawable, GCPtr pGC,
+		      int x, int y, unsigned int nglyph,
+		      CharInfoPtr *ppci, pointer pglyphBase)
+{
+    UXA_FALLBACK(("to %p (%c)\n", pDrawable,
+		  uxa_drawable_location(pDrawable)));
+    uxa_prepare_access (pDrawable, UXA_PREPARE_DEST);
+    uxa_prepare_access_gc (pGC);
+    fbImageGlyphBlt (pDrawable, pGC, x, y, nglyph, ppci, pglyphBase);
+    uxa_finish_access_gc (pGC);
+    uxa_finish_access (pDrawable, UXA_PREPARE_DEST);
+}
+
+void
+uxa_check_poly_glyph_blt (DrawablePtr pDrawable, GCPtr pGC,
+		     int x, int y, unsigned int nglyph,
+		     CharInfoPtr *ppci, pointer pglyphBase)
+{
+    UXA_FALLBACK(("to %p (%c), style %d alu %d\n", pDrawable,
+		  uxa_drawable_location(pDrawable), pGC->fillStyle, pGC->alu));
+    uxa_prepare_access (pDrawable, UXA_PREPARE_DEST);
+    uxa_prepare_access_gc (pGC);
+    fbPolyGlyphBlt (pDrawable, pGC, x, y, nglyph, ppci, pglyphBase);
+    uxa_finish_access_gc (pGC);
+    uxa_finish_access (pDrawable, UXA_PREPARE_DEST);
+}
+
+void
+uxa_check_push_pixels (GCPtr pGC, PixmapPtr pBitmap,
+		   DrawablePtr pDrawable,
+		   int w, int h, int x, int y)
+{
+    UXA_FALLBACK(("from %p to %p (%c,%c)\n", pBitmap, pDrawable,
+		  uxa_drawable_location(&pBitmap->drawable),
+		  uxa_drawable_location(pDrawable)));
+    uxa_prepare_access (pDrawable, UXA_PREPARE_DEST);
+    uxa_prepare_access (&pBitmap->drawable, UXA_PREPARE_SRC);
+    uxa_prepare_access_gc (pGC);
+    fbPushPixels (pGC, pBitmap, pDrawable, w, h, x, y);
+    uxa_finish_access_gc (pGC);
+    uxa_finish_access (&pBitmap->drawable, UXA_PREPARE_SRC);
+    uxa_finish_access (pDrawable, UXA_PREPARE_DEST);
+}
+
+void
+uxa_check_get_spans (DrawablePtr pDrawable,
+		 int wMax,
+		 DDXPointPtr ppt,
+		 int *pwidth,
+		 int nspans,
+		 char *pdstStart)
+{
+    UXA_FALLBACK(("from %p (%c)\n", pDrawable, uxa_drawable_location(pDrawable)));
+    uxa_prepare_access (pDrawable, UXA_PREPARE_SRC);
+    fbGetSpans (pDrawable, wMax, ppt, pwidth, nspans, pdstStart);
+    uxa_finish_access (pDrawable, UXA_PREPARE_SRC);
+}
+
+void
+uxa_check_composite (CARD8      op,
+                   PicturePtr pSrc,
+                   PicturePtr pMask,
+                   PicturePtr pDst,
+                   INT16      xSrc,
+                   INT16      ySrc,
+                   INT16      xMask,
+                   INT16      yMask,
+                   INT16      xDst,
+                   INT16      yDst,
+                   CARD16     width,
+                   CARD16     height)
+{
+    UXA_FALLBACK(("from picts %p/%p to pict %p\n",
+		 pSrc, pMask, pDst));
+
+    uxa_prepare_access (pDst->pDrawable, UXA_PREPARE_DEST);
+    if (pSrc->pDrawable != NULL)
+	uxa_prepare_access (pSrc->pDrawable, UXA_PREPARE_SRC);
+    if (pMask && pMask->pDrawable != NULL)
+	uxa_prepare_access (pMask->pDrawable, UXA_PREPARE_MASK);
+    fbComposite (op,
+                 pSrc,
+                 pMask,
+                 pDst,
+                 xSrc,
+                 ySrc,
+                 xMask,
+                 yMask,
+                 xDst,
+                 yDst,
+                 width,
+                 height);
+    if (pMask && pMask->pDrawable != NULL)
+	uxa_finish_access (pMask->pDrawable, UXA_PREPARE_MASK);
+    if (pSrc->pDrawable != NULL)
+	uxa_finish_access (pSrc->pDrawable, UXA_PREPARE_SRC);
+    uxa_finish_access (pDst->pDrawable, UXA_PREPARE_DEST);
+}
+
+void
+uxa_check_add_traps (PicturePtr	pPicture,
+		  INT16		x_off,
+		  INT16		y_off,
+		  int		ntrap,
+		  xTrap		*traps)
+{
+    UXA_FALLBACK(("to pict %p (%c)\n",
+		  uxa_drawable_location(pPicture->pDrawable)));
+    uxa_prepare_access(pPicture->pDrawable, UXA_PREPARE_DEST);
+    fbAddTraps (pPicture, x_off, y_off, ntrap, traps);
+    uxa_finish_access(pPicture->pDrawable, UXA_PREPARE_DEST);
+}
+
+/**
+ * Gets the 0,0 pixel of a pixmap.  Used for doing solid fills of tiled pixmaps
+ * that happen to be 1x1.  Pixmap must be at least 8bpp.
+ *
+ * XXX This really belongs in fb, so it can be aware of tiling and etc.
+ */
+CARD32
+uxa_get_pixmap_first_pixel (PixmapPtr pPixmap)
+{
+    CARD32 pixel;
+    void *fb;
+
+    uxa_prepare_access (&pPixmap->drawable, UXA_PREPARE_SRC);
+    fb = pPixmap->devPrivate.ptr;
+
+    switch (pPixmap->drawable.bitsPerPixel) {
+    case 32:
+	pixel = *(CARD32 *)fb;
+	break;
+    case 16:
+	pixel = *(CARD16 *)fb;
+	break;
+    default:
+	pixel = *(CARD8 *)fb;
+	break;
+    }
+    uxa_finish_access(&pPixmap->drawable, UXA_PREPARE_SRC);
+
+    return pixel;
+}