xf86-video-intel: Branch 'intel-batchbuffer' - 2 commits - src/i830_driver.c src/Makefile.am

[Kristian Høgsberg]

 src/Makefile.am   |    4 +++-
 src/i830_driver.c |    8 ++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 6d49886fe72474939c65a279a366f3b739bc9a1a
Author: Kristian Høgsberg <krh at redhat.com>
Date:   Wed Feb 27 17:17:13 2008 -0500

    Fail gracefully if we didn't managed to initialize a bufmgr.

diff --git a/src/i830_driver.c b/src/i830_driver.c
index cd9b6e4..2123e00 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -2493,6 +2493,14 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
    }
 #endif
 
+   /* The batchbuffer branch won't work without a bufmgr, so fail now
+    * if neither XF86DRI or DRI2 managed to set that up. */
+   if (pI830->bufmgr == NULL) {
+      xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+		 "Couldn't initialize TTM bufmgr\n");
+      return FALSE;
+   }
+
    /* Set up our video memory allocator for the chosen videoRam */
    if (!i830_allocator_init(pScrn, 0, pScrn->videoRam * KB(1))) {
       xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
commit ac800674115b8cfe159367fe149b9cd89828d4a5
Author: Kristian Høgsberg <krh at redhat.com>
Date:   Wed Feb 27 13:20:02 2008 -0500

    Add header files missing in Makefile.am.

diff --git a/src/Makefile.am b/src/Makefile.am
index a36eb1b..d23656b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -116,9 +116,11 @@ intel_drv_la_SOURCES = \
 	 i830_render.c \
 	 i915_render.c \
 	 i965_render.c \
+	 i965_render.h \
 	 dri_bufmgr.c \
          dri_bufmgr.h \
-         intel_bufmgr_ttm.c \
+	 dri_bufmgr_remap.h \
+	 intel_bufmgr_ttm.c \
          intel_bufmgr_ttm.h \
          intel_batchbuffer.c \
          intel_batchbuffer.h