xserver: Branch 'no-pci-rework' - 2 commits

[Michel Daenzer]

 exa/exa_unaccel.c |    2 ++
 1 file changed, 2 insertions(+)

New commits:
diff-tree 5a609821d1fffa011a6287d076d64a9cf17e4b07 (from ee4dd2e6f6b5ac72ca656847421cc9bab3313668)
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date:   Mon Sep 17 18:47:45 2007 +0200

    EXA: Fixed compiler warnings.

diff --git a/exa/exa_unaccel.c b/exa/exa_unaccel.c
index f81271d..8818ee2 100644
--- a/exa/exa_unaccel.c
+++ b/exa/exa_unaccel.c
@@ -265,11 +265,11 @@ ExaCheckPushPixels (GCPtr pGC, PixmapPtr
 		  exaDrawableLocation(&pBitmap->drawable),
 		  exaDrawableLocation(pDrawable)));
     exaPrepareAccess (pDrawable, EXA_PREPARE_DEST);
-    exaPrepareAccess (pBitmap, EXA_PREPARE_SRC);
+    exaPrepareAccess (&pBitmap->drawable, EXA_PREPARE_SRC);
     exaPrepareAccessGC (pGC);
     fbPushPixels (pGC, pBitmap, pDrawable, w, h, x, y);
     exaFinishAccessGC (pGC);
-    exaFinishAccess (pBitmap, EXA_PREPARE_SRC);
+    exaFinishAccess (&pBitmap->drawable, EXA_PREPARE_SRC);
     exaFinishAccess (pDrawable, EXA_PREPARE_DEST);
 }
 
diff-tree ee4dd2e6f6b5ac72ca656847421cc9bab3313668 (from 77cb8b9a8adf0ea65fe703d42509c6ce67571a0e)
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date:   Mon Sep 17 16:59:03 2007 +0200

    EXA: Added missing exaPrepare/FinishAccess calls in ExaCheckPushPixels.

diff --git a/exa/exa_unaccel.c b/exa/exa_unaccel.c
index fb21944..f81271d 100644
--- a/exa/exa_unaccel.c
+++ b/exa/exa_unaccel.c
@@ -265,9 +265,11 @@ ExaCheckPushPixels (GCPtr pGC, PixmapPtr
 		  exaDrawableLocation(&pBitmap->drawable),
 		  exaDrawableLocation(pDrawable)));
     exaPrepareAccess (pDrawable, EXA_PREPARE_DEST);
+    exaPrepareAccess (pBitmap, EXA_PREPARE_SRC);
     exaPrepareAccessGC (pGC);
     fbPushPixels (pGC, pBitmap, pDrawable, w, h, x, y);
     exaFinishAccessGC (pGC);
+    exaFinishAccess (pBitmap, EXA_PREPARE_SRC);
     exaFinishAccess (pDrawable, EXA_PREPARE_DEST);
 }