From 986cb2335c30792e24a7e2b930ecaa3fa051809a Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Tue, 6 Jan 2015 10:45:05 +0000 Subject: [PATCH] sna: Enable mmap(wc) support by default Now included in upstream kernels as of commit 1816f92363036600f2387bb8273b1e5e1f5b304e Author: Akash Goel Date: Fri Jan 2 16:29:30 2015 +0530 drm/i915: Support creation of unbound wc user mappings for objects Signed-off-by: Chris Wilson --- configure.ac | 10 ---------- src/sna/kgem.c | 5 ----- 2 files changed, 15 deletions(-) diff --git a/configure.ac b/configure.ac index 61bea435..314e638c 100644 --- a/configure.ac +++ b/configure.ac @@ -722,16 +722,6 @@ if test "x$RENDERNODE" = "xyes"; then xp_msg="$xp_msg rendernode" fi -AC_ARG_ENABLE(wc-mmap, - AS_HELP_STRING([--enable-wc-mmap], - [Enable use of WriteCombining mmaps [default=no]]), - [WC_MMAP="$enableval"], - [WC_MMAP="no"]) -if test "x$WC_MMAP" = "xyes"; then - AC_DEFINE(USE_WC_MMAP,1,[Enable use of WriteCombining mmaps]) - xp_msg="$xp_msg mmap(wc)" -fi - AC_ARG_ENABLE(create2, AS_HELP_STRING([--enable-create2], [Enable use of create2 ioctl (experimental) [default=no]]), diff --git a/src/sna/kgem.c b/src/sna/kgem.c index 78ed5407..aba6881b 100644 --- a/src/sna/kgem.c +++ b/src/sna/kgem.c @@ -96,11 +96,6 @@ search_snoop_cache(struct kgem *kgem, unsigned int num_pages, unsigned flags); #define SHOW_BATCH_BEFORE 0 #define SHOW_BATCH_AFTER 0 -#if !USE_WC_MMAP -#undef DBG_NO_WC_MMAP -#define DBG_NO_WC_MMAP 1 -#endif - #if 0 #define ASSERT_IDLE(kgem__, handle__) assert(!__kgem_busy(kgem__, handle__)) #define ASSERT_MAYBE_IDLE(kgem__, handle__, expect__) assert(!(expect__) || !__kgem_busy(kgem__, handle__))