Piteball
/
android_hardware_qcom_display
mirror of https://github.com/followmsi/android_hardware_qcom_display.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge "hwcomposer: Fix regression in hwc_sync" am: a0de1d3cc3 

am: 9e5907e6b4

Change-Id: If5b9888290f78e32db4e063da37993af8c391645
This commit is contained in:
Alex Naidis 2017-01-05 04:00:53 +00:00 committed by android-build-merger
parent 2fd6db2246 9e5907e6b4
commit e93a5f5337
15 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
msm8084/common.mk
View File

@ -33,6 +33,10 @@ ifneq ($(filter msm8974 msm8226 msm8610 msm8084 msm8916, \
common_flags += -DMDSS_TARGET
endif
ifeq ($(DISPLAY_DEBUG_SWAPINTERVAL),true)
common_flags += -DDEBUG_SWAPINTERVAL
endif
common_deps :=
kernel_includes :=

2
msm8084/libgralloc/framebuffer.cpp
View File

@ -64,6 +64,7 @@ struct fb_context_t {
static int fb_setSwapInterval(struct framebuffer_device_t* dev,
int interval)
{
#ifdef DEBUG_SWAPINTERVAL
//XXX: Get the value here and implement along with
//single vsync in HWC
char pval[PROPERTY_VALUE_MAX];
@ -71,6 +72,7 @@ static int fb_setSwapInterval(struct framebuffer_device_t* dev,
int property_interval = atoi(pval);
if (property_interval >= 0)
interval = property_interval;
#endif
private_module_t* m = reinterpret_cast<private_module_t*>(
dev->common.module);

2
msm8084/libhwcomposer/hwc_utils.cpp
View File

@ -1299,11 +1299,13 @@ int hwc_sync(hwc_context_t *ctx, hwc_display_contents_1_t* list, int dpy,
data.retire_fen_fd = &retireFd;
data.flags = MDP_BUF_SYNC_FLAG_RETIRE_FENCE;
#ifdef DEBUG_SWAPINTERVAL
char property[PROPERTY_VALUE_MAX];
if(property_get("debug.egl.swapinterval", property, "1") > 0) {
if(atoi(property) == 0)
swapzero = true;
}
#endif
bool isExtAnimating = false;
if(dpy)

4
msm8226/common.mk
View File

@ -37,6 +37,10 @@ ifeq ($(TARGET_HAS_VSYNC_FAILURE_FALLBACK), true)
common_flags += -DVSYNC_FAILURE_FALLBACK
endif
ifeq ($(DISPLAY_DEBUG_SWAPINTERVAL),true)
common_flags += -DDEBUG_SWAPINTERVAL
endif
common_deps :=
kernel_includes :=

2
msm8226/libgralloc/framebuffer.cpp
View File

@ -64,6 +64,7 @@ struct fb_context_t {
static int fb_setSwapInterval(struct framebuffer_device_t* dev,
int interval)
{
#ifdef DEBUG_SWAPINTERVAL
//XXX: Get the value here and implement along with
//single vsync in HWC
char pval[PROPERTY_VALUE_MAX];
@ -71,6 +72,7 @@ static int fb_setSwapInterval(struct framebuffer_device_t* dev,
int property_interval = atoi(pval);
if (property_interval >= 0)
interval = property_interval;
#endif
private_module_t* m = reinterpret_cast<private_module_t*>(
dev->common.module);

2
msm8226/libhwcomposer/hwc_utils.cpp
View File

@ -1287,11 +1287,13 @@ int hwc_sync(hwc_context_t *ctx, hwc_display_contents_1_t* list, int dpy,
data.retire_fen_fd = &retireFd;
data.flags = MDP_BUF_SYNC_FLAG_RETIRE_FENCE;
#ifdef DEBUG_SWAPINTERVAL
char property[PROPERTY_VALUE_MAX];
if(property_get("debug.egl.swapinterval", property, "1") > 0) {
if(atoi(property) == 0)
swapzero = true;
}
#endif
bool isExtAnimating = false;
if(dpy)

4
msm8909/common.mk
View File

@ -38,6 +38,10 @@ ifeq ($(call is-board-platform-in-list, msm8909), true)
common_flags += -DMDSS_TARGET
endif
ifeq ($(DISPLAY_DEBUG_SWAPINTERVAL),true)
common_flags += -DDEBUG_SWAPINTERVAL
endif
common_deps :=
kernel_includes :=

2
msm8909/libgralloc/framebuffer.cpp
View File

@ -57,6 +57,7 @@ struct fb_context_t {
static int fb_setSwapInterval(struct framebuffer_device_t* dev,
int interval)
{
#ifdef DEBUG_SWAPINTERVAL
//XXX: Get the value here and implement along with
//single vsync in HWC
char pval[PROPERTY_VALUE_MAX];
@ -64,6 +65,7 @@ static int fb_setSwapInterval(struct framebuffer_device_t* dev,
int property_interval = atoi(pval);
if (property_interval >= 0)
interval = property_interval;
#endif
private_module_t* m = reinterpret_cast<private_module_t*>(
dev->common.module);

2
msm8909/libhwcomposer/hwc_utils.cpp
View File

@ -1600,11 +1600,13 @@ int hwc_sync(hwc_context_t *ctx, hwc_display_contents_1_t* list, int dpy,
data.retire_fen_fd = &retireFd;
data.flags = MDP_BUF_SYNC_FLAG_RETIRE_FENCE;
#ifdef DEBUG_SWAPINTERVAL
char property[PROPERTY_VALUE_MAX];
if(property_get("debug.egl.swapinterval", property, "1") > 0) {
if(atoi(property) == 0)
swapzero = true;
}
#endif
bool isExtAnimating = false;
if(dpy)

4
msm8960/common.mk
View File

@ -25,6 +25,10 @@ ifneq ($(filter msm8974 msm8x74 msm8226 msm8x26,$(TARGET_BOARD_PLATFORM)),)
common_flags += -DMDSS_TARGET
endif
ifeq ($(DISPLAY_DEBUG_SWAPINTERVAL),true)
common_flags += -DDEBUG_SWAPINTERVAL
endif
common_deps :=
kernel_includes :=

2
msm8960/libgralloc/framebuffer.cpp
View File

@ -64,6 +64,7 @@ struct fb_context_t {
static int fb_setSwapInterval(struct framebuffer_device_t* dev,
int interval)
{
#ifdef DEBUG_SWAPINTERVAL
//XXX: Get the value here and implement along with
//single vsync in HWC
char pval[PROPERTY_VALUE_MAX];
@ -71,6 +72,7 @@ static int fb_setSwapInterval(struct framebuffer_device_t* dev,
int property_interval = atoi(pval);
if (property_interval >= 0)
interval = property_interval;
#endif
private_module_t* m = reinterpret_cast<private_module_t*>(
dev->common.module);

2
msm8960/libhwcomposer/hwc_utils.cpp
View File

@ -668,11 +668,13 @@ int hwc_sync(hwc_context_t *ctx, hwc_display_contents_1_t* list, int dpy,
data.rel_fen_fd = &releaseFd;
data.retire_fen_fd = &retireFd;
#ifdef DEBUG_SWAPINTERVAL
char property[PROPERTY_VALUE_MAX];
if(property_get("debug.egl.swapinterval", property, "1") > 0) {
if(atoi(property) == 0)
swapzero = true;
}
#endif
#ifndef MDSS_TARGET
//Send acquireFenceFds to rotator

4
msm8994/common.mk
View File

@ -28,6 +28,10 @@ endif
common_flags += -DVENUS_COLOR_FORMAT
common_flags += -DMDSS_TARGET
ifeq ($(DISPLAY_DEBUG_SWAPINTERVAL),true)
common_flags += -DDEBUG_SWAPINTERVAL
endif
common_deps :=
kernel_includes :=

2
msm8994/libgralloc/framebuffer.cpp
View File

@ -65,6 +65,7 @@ struct fb_context_t {
static int fb_setSwapInterval(struct framebuffer_device_t* dev,
int interval)
{
#ifdef DEBUG_SWAPINTERVAL
//XXX: Get the value here and implement along with
//single vsync in HWC
char pval[PROPERTY_VALUE_MAX];
@ -72,6 +73,7 @@ static int fb_setSwapInterval(struct framebuffer_device_t* dev,
int property_interval = atoi(pval);
if (property_interval >= 0)
interval = property_interval;
#endif
private_module_t* m = reinterpret_cast<private_module_t*>(
dev->common.module);

2
msm8994/libhwcomposer/hwc_utils.cpp
View File

@ -1513,11 +1513,13 @@ int hwc_sync(hwc_context_t *ctx, hwc_display_contents_1_t* list, int dpy,
data.retire_fen_fd = &retireFd;
data.flags = MDP_BUF_SYNC_FLAG_RETIRE_FENCE;
#ifdef DEBUG_SWAPINTERVAL
char property[PROPERTY_VALUE_MAX];
if(property_get("debug.egl.swapinterval", property, "1") > 0) {
if(atoi(property) == 0)
swapzero = true;
}
#endif
bool isExtAnimating = false;
if(dpy)