aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher R. Palmer <crpalmer@gmail.com>2015-11-23 04:33:59 -0500
committerChristopher R. Palmer <crpalmer@gmail.com>2015-11-27 15:29:18 -0500
commite80d2ba35cc47be42e9c5c55d5cf4c0c9dc44d28 (patch)
treeece7f4d6b5c0719bada61c23ae699f4bc86b283a
parentac747113d4f6739b1462ca7fb40f2091691e209b (diff)
downloadandroid_hardware_intel_common_libwsbm-e80d2ba35cc47be42e9c5c55d5cf4c0c9dc44d28.tar.gz
android_hardware_intel_common_libwsbm-e80d2ba35cc47be42e9c5c55d5cf4c0c9dc44d28.tar.bz2
android_hardware_intel_common_libwsbm-e80d2ba35cc47be42e9c5c55d5cf4c0c9dc44d28.zip
wsbm: Add support for LP blobs that predate ION support
Change-Id: I6e991a3f1094d7a4f82aa32b005374633abdc279
-rw-r--r--src/Android.mk5
-rw-r--r--src/wsbm_ttmpool.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/src/Android.mk b/src/Android.mk
index a049c9d..0fb2084 100644
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -3,6 +3,11 @@ ifeq ($(ENABLE_IMG_GRAPHICS),true)
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
+
+ifeq ($(INTEL_HWC_MOOREFIELD_HAS_LP_BLOBS),true)
+ LOCAL_CFLAGS += -DHAVE_LP_BLOBS
+endif
+
LOCAL_SRC_FILES:= \
wsbm_driver.c \
wsbm_fencemgr.c \
diff --git a/src/wsbm_ttmpool.c b/src/wsbm_ttmpool.c
index 3b594b3..1e253e4 100644
--- a/src/wsbm_ttmpool.c
+++ b/src/wsbm_ttmpool.c
@@ -556,7 +556,9 @@ ttm_pool_ub_create(struct _WsbmBufferPool *pool, unsigned long size, uint32_t pl
arg.req.placement = placement;
arg.req.page_alignment = alignment / pageSize;
arg.req.user_address = (unsigned long)user_ptr;
+#ifndef HAVE_LP_BLOBS
arg.req.fd = fd;
+#endif
DRMRESTARTCOMMANDWRITEREAD(pool->fd, ttmPool->devOffset + TTM_PL_CREATE_UB,
arg, ret);