xf86-video-intel: Branch 'intel-batchbuffer' - 2 commits - configure.ac src/i830.h src/i830_memory.c
Kristian Høgsberg
krh at kemper.freedesktop.org
Mon Mar 10 13:22:23 PDT 2008
configure.ac | 4 ++--
src/i830.h | 1 +
src/i830_memory.c | 1 +
3 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 033517fa3b36cad29afee8ba9f8d26ce1d17e085
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Mar 7 08:04:37 2008 +1000
fixup pciaccess version detect
diff --git a/configure.ac b/configure.ac
index c9773e6..847a39f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -124,9 +124,9 @@ AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
CFLAGS="$save_CFLAGS"
if test x$XSERVER_LIBPCIACCESS = xyes; then
- PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10.0])
+ PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10])
else
- PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10.0],
+ PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10],
have_libpciaccess=yes,
have_libpciaccess=no)
fi
commit d84fac6b1c32f53a8a00519c59a8aa53e1cf6e32
Author: Kristian Høgsberg <krh at redhat.com>
Date: Mon Mar 10 16:19:42 2008 -0400
Add need_vram field for the validate workaround.
diff --git a/src/i830.h b/src/i830.h
index 63ba9f0..5bc1139 100644
--- a/src/i830.h
+++ b/src/i830.h
@@ -199,6 +199,7 @@ struct _i830_memory {
#ifdef XF86DRI_MM
drmBO bo;
Bool lifetime_fixed_offset;
+ Bool need_vram;
#endif
};
diff --git a/src/i830_memory.c b/src/i830_memory.c
index 1610e2f..018a64c 100644
--- a/src/i830_memory.c
+++ b/src/i830_memory.c
@@ -793,6 +793,7 @@ i830_allocate_memory_bo(ScrnInfoPtr pScrn, const char *name,
mem->end = -1;
mem->size = size;
mem->allocated_size = size;
+ mem->need_vram = (flags & NEED_PHYSICAL_ADDR) ? 1 : 0;
if (flags & NEED_LIFETIME_FIXED)
mem->lifetime_fixed_offset = TRUE;
More information about the xorg-commit
mailing list