xf86-video-intel: 2 commits - src/i830_exa.c uxa/uxa-accel.c uxa/uxa-priv.h uxa/uxa-render.c uxa/uxa-unaccel.c

[Eric Anholt]

 src/i830_exa.c    |    2 +-
 uxa/uxa-accel.c   |    8 ++++----
 uxa/uxa-priv.h    |    7 ++++++-
 uxa/uxa-render.c  |   10 +++-------
 uxa/uxa-unaccel.c |    2 --
 5 files changed, 14 insertions(+), 15 deletions(-)

New commits:
commit 5009127de7d9527ae329d1c2fbc7283648bde2e6
Author: Eric Anholt <eric at anholt.net>
Date:   Tue Feb 10 18:23:35 2009 -0800

    uxa: Fix driver against fbDoCopy -> miDoCopy change in the server.

diff --git a/uxa/uxa-accel.c b/uxa/uxa-accel.c
index 785855c..1b0af9c 100644
--- a/uxa/uxa-accel.c
+++ b/uxa/uxa-accel.c
@@ -493,9 +493,9 @@ uxa_copy_area(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, GCPtr pGC,
                                  srcx, srcy, width, height, dstx, dsty);
     }
 
-    return  fbDoCopy (pSrcDrawable, pDstDrawable, pGC,
-                      srcx, srcy, width, height,
-                      dstx, dsty, uxa_copy_n_to_n, 0, NULL);
+    return miDoCopy (pSrcDrawable, pDstDrawable, pGC,
+		     srcx, srcy, width, height,
+		     dstx, dsty, uxa_copy_n_to_n, 0, NULL);
 }
 
 static void
@@ -841,7 +841,7 @@ uxa_copy_window(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
 			  -pPixmap->screen_x, -pPixmap->screen_y);
 #endif
 
-    fbCopyRegion (&pPixmap->drawable, &pPixmap->drawable,
+    miCopyRegion (&pPixmap->drawable, &pPixmap->drawable,
 		  NULL,
 		  &rgnDst, dx, dy, uxa_copy_n_to_n, 0, NULL);
 
diff --git a/uxa/uxa-priv.h b/uxa/uxa-priv.h
index 463749a..ae3fb2a 100644
--- a/uxa/uxa-priv.h
+++ b/uxa/uxa-priv.h
@@ -61,7 +61,12 @@
 #endif
 #include "damage.h"
 
-#define DEBUG_TRACE_FALL	0
+/* 1.6 and earlier server compat */
+#ifndef miGetCompositeClip
+#define miCopyRegion fbCopyRegion
+#define miDoCopy fbDoCopy
+#endif
+
 #define DEBUG_MIGRATE		0
 #define DEBUG_PIXMAP		0
 #define DEBUG_OFFSCREEN		0
commit b53977f4c53c7c8f562f909e985b8d5a7b2526f3
Author: Eric Anholt <eric at anholt.net>
Date:   Tue Feb 10 18:22:46 2009 -0800

    uxa: Fix failure to --amend in further changes in previous commit.

diff --git a/src/i830_exa.c b/src/i830_exa.c
index d18bcd2..ebc6624 100644
--- a/src/i830_exa.c
+++ b/src/i830_exa.c
@@ -1007,7 +1007,7 @@ i830_uxa_init (ScreenPtr pScreen)
 
     I830SelectBuffer(scrn, I830_SELECT_FRONT);
 
-    uxa_set_fallback_debug(pI830->fallback_debug);
+    uxa_set_fallback_debug(pScreen, i830->fallback_debug);
 
     return TRUE;
 }
diff --git a/uxa/uxa-render.c b/uxa/uxa-render.c
index 13635f8..60022cc 100644
--- a/uxa/uxa-render.c
+++ b/uxa/uxa-render.c
@@ -33,13 +33,11 @@
 #ifdef RENDER
 #include "mipict.h"
 
-#if DEBUG_TRACE_FALL
 static void uxa_composite_fallback_pict_desc(PicturePtr pict, char *string, int n)
 {
     char format[20];
     char size[20];
     char loc;
-    int temp;
 
     if (!pict) {
 	snprintf(string, n, "None");
@@ -71,7 +69,7 @@ static void uxa_composite_fallback_pict_desc(PicturePtr pict, char *string, int
 	break;
     }
 
-    loc = uxa_get_drawable_pixmap(pict->pDrawable, &temp, &temp) ? 's' : 'm';
+    loc = uxa_get_drawable_pixmap(pict->pDrawable) ? 's' : 'm';
 
     snprintf(size, 20, "%dx%d%s", pict->pDrawable->width,
 	     pict->pDrawable->height, pict->repeat ?
@@ -112,7 +110,6 @@ uxa_print_composite_fallback(CARD8 op,
 	   "                    dst  %s, \n",
 	   sop, srcdesc, maskdesc, dstdesc);
 }
-#endif /* DEBUG_TRACE_FALL */
 
 Bool
 uxa_op_reads_destination (CARD8 op)
@@ -775,9 +772,8 @@ uxa_composite(CARD8	op,
     }
 
 fallback:
-#if DEBUG_TRACE_FALL
-    uxa_print_composite_fallback (op, pSrc, pMask, pDst);
-#endif
+    if (uxa_screen->fallback_debug)
+	uxa_print_composite_fallback (op, pSrc, pMask, pDst);
 
     uxa_check_composite (op, pSrc, pMask, pDst, xSrc, ySrc,
 		      xMask, yMask, xDst, yDst, width, height);
diff --git a/uxa/uxa-unaccel.c b/uxa/uxa-unaccel.c
index d2c5de0..8f86468 100644
--- a/uxa/uxa-unaccel.c
+++ b/uxa/uxa-unaccel.c
@@ -68,13 +68,11 @@ uxa_finish_access_gc(GCPtr pGC)
         uxa_finish_access(&pGC->stipple->drawable);
 }
 
-#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,