xf86-video-intel: Branch 'intel-batchbuffer' - src/i830_exa.c

[Dave Airlie]

 src/i830_exa.c |   17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

New commits:
commit f5827729ea8f6bde3eb9e2bb39af1841c644039d
Author: Dave Airlie <airlied at redhat.com>
Date:   Wed Jan 23 12:26:22 2008 +1100

    initial support for tex offset, really needs DRI2 and passing BOs around

diff --git a/src/i830_exa.c b/src/i830_exa.c
index 45a537a..9e563e7 100644
--- a/src/i830_exa.c
+++ b/src/i830_exa.c
@@ -666,9 +666,20 @@ extern void ExaOffscreenMarkUsed(PixmapPtr);
 unsigned long long
 I830TexOffsetStart(PixmapPtr pPix)
 {
-    exaMoveInPixmap(pPix);
-    ExaOffscreenMarkUsed(pPix);
+    ScreenPtr pScreen = pPix->drawable.pScreen;
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    I830Ptr pI830 = I830PTR(pScrn);
 
-    return exaGetPixmapOffset(pPix);
+    if (pI830->use_ttm_batch) {
+	struct i830_exa_pixmap_priv *driver_priv;
+	driver_priv = exaGetPixmapDriverPrivate(pPix);
+
+	return driver_priv->bo->offset;
+    } else {
+        exaMoveInPixmap(pPix);
+        ExaOffscreenMarkUsed(pPix);
+
+        return exaGetPixmapOffset(pPix);
+    }
 }
 #endif