LineageOS/android_vendor_qcom_opensource_display-commonsys-intf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "hwc: handle blank/unblank for virtual display explicitly."

Browse Source
This commit is contained in:
Linux Build Service Account
2013-03-07 11:36:16 -08:00
committed by Gerrit - the friendly Code Review server
parent 37f96f5fd6 893d6eeb16
commit fe7c61431a
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
libhwcomposer/hwc.cpp
View File

@@ -248,18 +248,34 @@ static int hwc_blank(struct hwc_composer_device_1* dev, int dpy, int blank)
ctx->mOverlay->configBegin(); ctx->mOverlay->configBegin();
ctx->mOverlay->configDone(); ctx->mOverlay->configDone();
ret = ioctl(m->framebuffer->fd, FBIOBLANK, FB_BLANK_POWERDOWN); ret = ioctl(m->framebuffer->fd, FBIOBLANK, FB_BLANK_POWERDOWN);
if(ctx->dpyAttr[HWC_DISPLAY_VIRTUAL].connected == true) {
// Surfaceflinger does not send Blank/unblank event to hwc
// for virtual display, handle it explicitly when blank for
// primary is invoked, so that any pipes unset get committed
if (!ctx->mExtDisplay->post()) {
ret = -1;
ALOGE("%s:post failed for virtual display !!",
__FUNCTION__);
} else {
ctx->dpyAttr[HWC_DISPLAY_VIRTUAL].isActive = !blank;
}
}
} else { } else {
ret = ioctl(m->framebuffer->fd, FBIOBLANK, FB_BLANK_UNBLANK); ret = ioctl(m->framebuffer->fd, FBIOBLANK, FB_BLANK_UNBLANK);
if(ctx->dpyAttr[HWC_DISPLAY_VIRTUAL].connected == true) {
ctx->dpyAttr[HWC_DISPLAY_VIRTUAL].isActive = !blank;
}
} }
break; break;
case HWC_DISPLAY_EXTERNAL: case HWC_DISPLAY_EXTERNAL:
case HWC_DISPLAY_VIRTUAL:
if(blank) { if(blank) {
// External/Virtual Display post commits the changes to display // External post commits the changes to display
// Call this on blank, so that any pipe unsets gets committed // Call this on blank, so that any pipe unsets gets committed
if (!ctx->mExtDisplay->post()) { if (!ctx->mExtDisplay->post()) {
ret = -1; ret = -1;
ALOGE("%s:ctx->mExtDisplay->post fail!! ", __FUNCTION__); ALOGE("%s:post failed for external display !! ",
__FUNCTION__);
} }
} else { } else {
} }
@@ -314,7 +330,6 @@ static int hwc_set_primary(hwc_context_t *ctx, hwc_display_contents_1_t* list) {
ATRACE_CALL(); ATRACE_CALL();
int ret = 0; int ret = 0;
const int dpy = HWC_DISPLAY_PRIMARY; const int dpy = HWC_DISPLAY_PRIMARY;
if (LIKELY(list) && ctx->dpyAttr[dpy].isActive) { if (LIKELY(list) && ctx->dpyAttr[dpy].isActive) {
uint32_t last = list->numHwLayers - 1; uint32_t last = list->numHwLayers - 1;
hwc_layer_1_t *fbLayer = &list->hwLayers[last]; hwc_layer_1_t *fbLayer = &list->hwLayers[last];