Merge "hwcomposer: Fix regression in hwc_sync" am: a0de1d3cc3
am: 9e5907e6b4
am: e93a5f5337
Change-Id: I08fdcbe22795f684bb4dd669c4438a2bace30796
This commit is contained in:
commit
47cec256dd
|
@ -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 :=
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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 :=
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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 :=
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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 :=
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 :=
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue