summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGowtham Tammana <g-tammana@ti.com>2017-12-15 16:19:02 -0600
committerVishal Mahaveer <vishalm@ti.com>2017-12-15 17:34:39 -0500
commit132d8af7e33884494b34b9904368edc1786465ca (patch)
treefd95ddf32ac7f6b586bc4ea4c5de2dfb7627ecb7
parent6df274e979a0ab55fdde16b0718da5f5bd9ff58a (diff)
downloaddra7xx-d-marshmallow-mr3-release.tar.gz
hwc: Increment timeline on display udpate failuresd-marshmallow-mr3-release
If failures are noticed during display update, increment timeline to signal previously posted flips. Change-Id: I2669b8dca4be323d4a241aa9287e22f844fd4140 Signed-off-by: Gowtham Tammana <g-tammana@ti.com> (cherry picked from commit 76799ec15c490e73b9353171360215641df26e16)
-rw-r--r--hwcomposer/display.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/hwcomposer/display.c b/hwcomposer/display.c
index de1aa25..965e50d 100644
--- a/hwcomposer/display.c
+++ b/hwcomposer/display.c
@@ -1176,8 +1176,11 @@ int update_display(omap_hwc_device_t *ctx, int disp,
hwc_layer_1_t *layer = comp->plane_info[i].layer;
if (comp->plane_info[i].layer) {
ret = fence_wait(layer->acquireFenceFd);
- if (ret)
+ if (ret) {
+ ALOGE("Wait on acquirefence failed for overlay %d\n", i);
+ timeline_inc(&display->retire_sync);
return -EBUSY;
+ }
close(layer->acquireFenceFd);
layer->acquireFenceFd = -1;
}
@@ -1244,6 +1247,7 @@ int update_display(omap_hwc_device_t *ctx, int disp,
pthread_mutex_unlock(&display->lock);
close(fence_fd);
fence_fd = -1;
+ timeline_inc(&display->retire_sync);
goto fb_cleanup;
}