summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2008-12-02 13:01:56 -0800
committerEric Anholt <eric@anholt.net>2008-12-02 13:01:56 -0800
commit34d54db945c67a2fee0a38cc9eafc463b8413669 (patch)
tree1408f85699d7cfe826fff728024d9e7cc2e3798f
parentf7540df184a75a749cabcfa2da8974d3d0714ea6 (diff)
Remove DRI_MM defines which are always true now.
-rw-r--r--configure.ac4
-rw-r--r--src/i830_memory.c3
2 files changed, 0 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac
index 41438ecd..67d51b79 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 2bbffed6..ca159649 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