xf86-video-intel: 2 commits - src/i830_display.c src/i830_driver.c src/i830_memory.c
Alan Coopersmith
alanc at kemper.freedesktop.org
Tue Oct 30 18:20:59 PDT 2007
src/i830_display.c | 4 ++--
src/i830_driver.c | 2 +-
src/i830_memory.c | 7 ++++++-
3 files changed, 9 insertions(+), 4 deletions(-)
New commits:
commit ecd995d533d28b622afc71a20504d47c33ff5b8d
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date: Tue Oct 30 18:20:49 2007 -0700
Fix builds without DRI
diff --git a/src/i830_driver.c b/src/i830_driver.c
index 0ab7e8f..488232d 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -172,6 +172,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <stdlib.h>
#include <stdio.h>
#include <sys/mman.h>
+#include <errno.h>
#include "xf86.h"
#include "xf86_OSproc.h"
@@ -202,7 +203,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifdef XF86DRI
#include "dri.h"
#include <sys/ioctl.h>
-#include <errno.h>
#ifdef XF86DRI_MM
#include "xf86mm.h"
#endif
diff --git a/src/i830_memory.c b/src/i830_memory.c
index 91d7beb..d9f8a26 100644
--- a/src/i830_memory.c
+++ b/src/i830_memory.c
@@ -313,12 +313,14 @@ i830_reset_allocations(ScrnInfoPtr pScrn)
while (pI830->memory_list->next->next != NULL) {
i830_memory *mem = pI830->memory_list->next;
+#ifdef XF86DRI
/* Don't reset BO allocator, which we set up at init. */
if (pI830->memory_manager == mem) {
mem = mem->next;
if (mem->next == NULL)
break;
}
+#endif
i830_free_memory(pScrn, pI830->memory_list->next);
}
@@ -825,11 +827,14 @@ i830_allocate_memory(ScrnInfoPtr pScrn, const char *name,
I830Ptr pI830 = I830PTR(pScrn);
i830_memory *mem;
+#ifdef XF86DRI_MM
if (pI830->memory_manager && !(flags & NEED_PHYSICAL_ADDR) &&
!(flags & NEED_LIFETIME_FIXED))
{
return i830_allocate_memory_bo(pScrn, name, size, alignment, flags);
- } else {
+ } else
+#endif
+ {
mem = i830_allocate_aperture(pScrn, name, size, alignment, flags);
if (mem == NULL)
return NULL;
commit 7c88b58a93fce9fda59b6344acb87af16336e287
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date: Tue Oct 30 18:20:15 2007 -0700
Clear compiler error: "void functions cannot return values"
diff --git a/src/i830_display.c b/src/i830_display.c
index 292814c..a99b4a5 100644
--- a/src/i830_display.c
+++ b/src/i830_display.c
@@ -224,9 +224,9 @@ static void i9xx_clock(int refclk, intel_clock_t *clock)
static void intel_clock(I830Ptr pI830, int refclk, intel_clock_t *clock)
{
if (IS_I9XX(pI830))
- return i9xx_clock (refclk, clock);
+ i9xx_clock (refclk, clock);
else
- return i8xx_clock (refclk, clock);
+ i8xx_clock (refclk, clock);
}
static void
More information about the xorg-commit
mailing list