Merge "display: Use fences for all targets"
diff --git a/common.mk b/common.mk
index ed8edc3..30896a8 100644
--- a/common.mk
+++ b/common.mk
@@ -21,12 +21,6 @@
common_flags := -DDEBUG_CALC_FPS -Wno-missing-field-initializers
common_flags += -Werror
-#TODO
-#ifeq ($(call is-vendor-board-platform,QCOM),true)
-ifeq ($(TARGET_BOARD_PLATFORM), msm8960)
- common_flags += -DUSE_FENCE_SYNC
-endif
-
ifeq ($(ARCH_ARM_HAVE_NEON),true)
common_flags += -D__ARM_HAVE_NEON
endif
diff --git a/libgenlock/Android.mk b/libgenlock/Android.mk
index 72dc6c5..92ac227 100644
--- a/libgenlock/Android.mk
+++ b/libgenlock/Android.mk
@@ -7,9 +7,6 @@
LOCAL_C_INCLUDES := $(common_includes)
LOCAL_SHARED_LIBRARIES := liblog libcutils
LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"libgenlock\"
-ifneq ($(TARGET_BOARD_PLATFORM), msm8960)
- LOCAL_CFLAGS += -DUSE_GENLOCK
-endif
LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps)
LOCAL_SRC_FILES := genlock.cpp
include $(BUILD_SHARED_LIBRARY)
diff --git a/libhwcomposer/hwc_utils.cpp b/libhwcomposer/hwc_utils.cpp
index 5747019..0ae64da 100644
--- a/libhwcomposer/hwc_utils.cpp
+++ b/libhwcomposer/hwc_utils.cpp
@@ -232,7 +232,6 @@
int hwc_sync(hwc_context_t *ctx, hwc_display_contents_1_t* list, int dpy) {
int ret = 0;
-#ifdef USE_FENCE_SYNC
struct mdp_buf_sync data;
int acquireFd[MAX_NUM_LAYERS];
int count = 0;
@@ -273,7 +272,6 @@
}
}
list->retireFenceFd = releaseFd;
-#endif
return ret;
}