xf86-video-intel: 3 commits - src/i830_driver.c src/i830_memory.c

[Eric Anholt]

 src/i830_driver.c |    1 -
 src/i830_memory.c |   10 +++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

New commits:
diff-tree dfa22df8ce7713b491c4766ce6ce652db91b5f90 (from 7db9d706a1bc9da7afc4823cee92b23e96ae55b8)
Author: Eric Anholt <eric at anholt.net>
Date:   Fri Oct 5 12:53:07 2007 -0700

    Don't leak buffer object allocations in i830_reset_allocations().

diff --git a/src/i830_memory.c b/src/i830_memory.c
index c850033..d2aa327 100644
--- a/src/i830_memory.c
+++ b/src/i830_memory.c
@@ -272,6 +272,14 @@ i830_reset_allocations(ScrnInfoPtr pScrn
     while (pI830->memory_list->next->next != NULL)
 	i830_free_memory(pScrn, pI830->memory_list->next);
 
+    /* Free any allocations in buffer objects */
+#ifdef XF86DRI_MM
+    if (pI830->memory_manager) {
+	while (pI830->bo_list != NULL)
+	    i830_free_memory(pScrn, pI830->bo_list);
+    }
+#endif
+
     /* Null out the pointers for all the allocations we just freed.  This is
      * kind of gross, but at least it's just one place now.
      */
diff-tree 7db9d706a1bc9da7afc4823cee92b23e96ae55b8 (from bf33c4e2d91172efd08690fadda7b3743dd3de62)
Author: Eric Anholt <eric at anholt.net>
Date:   Fri Oct 5 12:40:48 2007 -0700

    Warning cleanup.

diff --git a/src/i830_driver.c b/src/i830_driver.c
index dc27170..0d55609 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -2270,7 +2270,6 @@ I830ScreenInit(int scrnIndex, ScreenPtr 
    Bool allocation_done = FALSE;
    MessageType from;
 #ifdef XF86DRI
-   Bool driDisabled;
    xf86CrtcConfigPtr config;
 #endif
 
diff-tree bf33c4e2d91172efd08690fadda7b3743dd3de62 (from 04e936935f0b0045600241424f1d04a6721a2432)
Author: Eric Anholt <eric at anholt.net>
Date:   Fri Oct 5 12:40:37 2007 -0700

    Fix formatting of error message.

diff --git a/src/i830_memory.c b/src/i830_memory.c
index 7ae2332..c850033 100644
--- a/src/i830_memory.c
+++ b/src/i830_memory.c
@@ -1434,7 +1434,7 @@ i830_allocate_2d_memory(ScrnInfoPtr pScr
 				     size, 1, NEED_LIFETIME_FIXED);
 	    if (pI830->exa_offscreen == NULL) {
 		xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
-			   "Failed to allocate EXA offscreen memory.");
+			   "Failed to allocate EXA offscreen memory.\n");
 		return FALSE;
 	    }
 	}