Merge "display: Use fences for all targets"
This commit is contained in:
committed by
Gerrit - the friendly Code Review server
commit
e97c35ffb5
@@ -21,12 +21,6 @@ common_libs := liblog libutils libcutils libhardware
|
|||||||
common_flags := -DDEBUG_CALC_FPS -Wno-missing-field-initializers
|
common_flags := -DDEBUG_CALC_FPS -Wno-missing-field-initializers
|
||||||
common_flags += -Werror
|
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)
|
ifeq ($(ARCH_ARM_HAVE_NEON),true)
|
||||||
common_flags += -D__ARM_HAVE_NEON
|
common_flags += -D__ARM_HAVE_NEON
|
||||||
endif
|
endif
|
||||||
|
|||||||
@@ -7,9 +7,6 @@ LOCAL_MODULE_TAGS := optional
|
|||||||
LOCAL_C_INCLUDES := $(common_includes)
|
LOCAL_C_INCLUDES := $(common_includes)
|
||||||
LOCAL_SHARED_LIBRARIES := liblog libcutils
|
LOCAL_SHARED_LIBRARIES := liblog libcutils
|
||||||
LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"libgenlock\"
|
LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"libgenlock\"
|
||||||
ifneq ($(TARGET_BOARD_PLATFORM), msm8960)
|
|
||||||
LOCAL_CFLAGS += -DUSE_GENLOCK
|
|
||||||
endif
|
|
||||||
LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps)
|
LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps)
|
||||||
LOCAL_SRC_FILES := genlock.cpp
|
LOCAL_SRC_FILES := genlock.cpp
|
||||||
include $(BUILD_SHARED_LIBRARY)
|
include $(BUILD_SHARED_LIBRARY)
|
||||||
|
|||||||
@@ -232,7 +232,6 @@ bool isExternalActive(hwc_context_t* ctx) {
|
|||||||
|
|
||||||
int hwc_sync(hwc_context_t *ctx, hwc_display_contents_1_t* list, int dpy) {
|
int hwc_sync(hwc_context_t *ctx, hwc_display_contents_1_t* list, int dpy) {
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
#ifdef USE_FENCE_SYNC
|
|
||||||
struct mdp_buf_sync data;
|
struct mdp_buf_sync data;
|
||||||
int acquireFd[MAX_NUM_LAYERS];
|
int acquireFd[MAX_NUM_LAYERS];
|
||||||
int count = 0;
|
int count = 0;
|
||||||
@@ -273,7 +272,6 @@ int hwc_sync(hwc_context_t *ctx, hwc_display_contents_1_t* list, int dpy) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
list->retireFenceFd = releaseFd;
|
list->retireFenceFd = releaseFd;
|
||||||
#endif
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user