xf86-video-intel: 2 commits - configure.ac src/i830_exa.c src/i830_memory.c

[Eric Anholt]

 configure.ac      |    6 +-----
 src/i830_exa.c    |   40 +++++++++++++++++++++++++++++++++++-----
 src/i830_memory.c |    3 ---
 3 files changed, 36 insertions(+), 13 deletions(-)

New commits:
commit 00ae7a571b6413aa2530e4f1310f8f4646631946
Author: Eric Anholt <eric at anholt.net>
Date:   Tue Dec 2 13:08:23 2008 -0800

    UXA: Add support for tiled front/back/depth by cutting over to the GTT map.

diff --git a/configure.ac b/configure.ac
index 67d51b7..3d5b084 100644
--- a/configure.ac
+++ b/configure.ac
@@ -224,7 +224,7 @@ if test "x$GCC" = "xyes"; then
 	-Wnested-externs -fno-strict-aliasing"
 fi
 
-PKG_CHECK_MODULES(DRM, [libdrm >= 2.4.0])
+PKG_CHECK_MODULES(DRM, [libdrm >= 2.4.2])
 AM_CONDITIONAL(DRI, test x$DRI = xyes)
 if test "$DRI" = yes; then
         PKG_CHECK_MODULES(DRI, [xf86driproto glproto])
diff --git a/src/i830_exa.c b/src/i830_exa.c
index 47f0ddf..baa8d87 100644
--- a/src/i830_exa.c
+++ b/src/i830_exa.c
@@ -35,6 +35,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "xaarop.h"
 #include "i830.h"
 #include "i810_reg.h"
+#include "i915_drm.h"
 #include <string.h>
 
 #define ALWAYS_SYNC		0
@@ -94,6 +95,21 @@ i830_pixmap_tiled(PixmapPtr pPixmap)
     ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
     I830Ptr pI830 = I830PTR(pScrn);
     unsigned long offset;
+    dri_bo *bo;
+
+    bo = i830_get_pixmap_bo(pPixmap);
+    if (bo != NULL) {
+	uint32_t tiling_mode, swizzle_mode;
+	int ret;
+
+	ret = drm_intel_bo_get_tiling(bo, &tiling_mode, &swizzle_mode);
+	if (ret != 0) {
+	    FatalError("Couldn't get tiling on bo %p: %s\n",
+		       bo, strerror(-ret));
+	}
+
+	return tiling_mode != I915_TILING_NONE;
+    }
 
     offset = intel_get_pixmap_offset(pPixmap);
     if (offset == pI830->front_buffer->offset &&
@@ -747,6 +763,8 @@ i830_uxa_set_pixmap_bo (PixmapPtr pixmap, dri_bo *bo)
 static Bool
 i830_uxa_prepare_access (PixmapPtr pixmap, uxa_access_t access)
 {
+    ScrnInfoPtr pScrn = xf86Screens[pixmap->drawable.pScreen->myNum];
+    I830Ptr pI830 = I830PTR(pScrn);
     dri_bo *bo = i830_get_pixmap_bo (pixmap);
 
     if (bo) {
@@ -755,13 +773,23 @@ i830_uxa_prepare_access (PixmapPtr pixmap, uxa_access_t access)
 	I830Ptr i830 = I830PTR(scrn);
 	
 	intel_batch_flush(scrn, FALSE);
+	/* XXX: dri_bo_map should handle syncing for us, what's the deal? */
 	if (i830->need_sync) {
 	    I830Sync(scrn);
 	    i830->need_sync = FALSE;
 	}
-	if (dri_bo_map (bo, access == UXA_ACCESS_RW) != 0)
-	    return FALSE;
-        pixmap->devPrivate.ptr = bo->virtual;
+
+	/* For tiled front buffer, short-circuit to the GTT mapping. */
+	if (i830_pixmap_tiled(pixmap)) {
+	    drm_intel_gem_bo_start_gtt_access(bo, access == UXA_ACCESS_RW);
+
+	    pixmap->devPrivate.ptr = pI830->FbBase + bo->offset;
+	} else {
+	    if (dri_bo_map (bo, access == UXA_ACCESS_RW) != 0)
+		return FALSE;
+
+	    pixmap->devPrivate.ptr = bo->virtual;
+	}
     }
     return TRUE;
 }
@@ -775,8 +803,10 @@ i830_uxa_finish_access (PixmapPtr pixmap)
 	ScreenPtr screen = pixmap->drawable.pScreen;
 	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
 	I830Ptr i830 = I830PTR(scrn);
-	
-	dri_bo_unmap (bo);
+
+	if (!i830_pixmap_tiled(pixmap))
+	    dri_bo_unmap(bo);
+
 	pixmap->devPrivate.ptr = NULL;
 	if (bo == i830->front_buffer->bo)
 	    i830->need_flush = TRUE;
commit 34d54db945c67a2fee0a38cc9eafc463b8413669
Author: Eric Anholt <eric at anholt.net>
Date:   Tue Dec 2 13:01:56 2008 -0800

    Remove DRI_MM defines which are always true now.

diff --git a/configure.ac b/configure.ac
index 41438ec..67d51b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -230,10 +230,6 @@ if test "$DRI" = yes; then
         PKG_CHECK_MODULES(DRI, [xf86driproto glproto])
         AC_DEFINE(XF86DRI,1,[Enable DRI driver support])
         AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support])
-	PKG_CHECK_MODULES(DRI_MM, [libdrm >= 2.4.0],[DRI_MM=yes], [DRI_MM=no])
-	if test "x$DRI_MM" = xyes; then
-		AC_DEFINE(XF86DRI_MM,1,[Extended DRI memory management])
-	fi
 	if test "$have_damage_h" = yes; then
 		AC_DEFINE(DAMAGE,1,[Use Damage extension])
 	fi
diff --git a/src/i830_memory.c b/src/i830_memory.c
index 2bbffed..ca15964 100644
--- a/src/i830_memory.c
+++ b/src/i830_memory.c
@@ -2131,7 +2131,6 @@ Bool i830_allocate_xvmc_buffer(ScrnInfoPtr pScrn, const char *name,
 }
 #endif
 
-#ifdef XF86DRI_MM
 #if 0
 static i830_memory *
 i830_allocate_framebuffer_new(ScrnInfoPtr pScrn, I830Ptr pI830, BoxPtr FbMemBox)
@@ -2243,5 +2242,3 @@ i830_create_new_fb(ScrnInfoPtr pScrn, int width, int height, int *pitch)
     return pI830->front_buffer->bo->handle;
 #endif
 }
-
-#endif