commit cb1cfc866b47c480a9fa84f6edcc5239ac99d277
author Zach Reizner <zachr@google.com> Fri Nov 13 16:11:37 2015 -0800
committer Zach Reizner <zachr@google.com> Fri Nov 13 16:11:37 2015 -0800
tree d6e02a310e7bfdb5cb40d3ac2bc2e2a1bd707b40
parent 49446bc72b33b8b68352b2048657bea4a8da4a42

drm_hwcomposer: avoid creating release fences for invalid OutputFd

This change also adds a check for OutputFd to see if it is valid.

Change-Id: If992d523c707cc5e6e660de721938a26f27477d8

drmdisplaycomposition.cpp

diff --git a/drmdisplaycomposition.cpp b/drmdisplaycomposition.cpp
index 9e591ea..b266bd7 100644
--- a/drmdisplaycomposition.cpp
+++ b/drmdisplaycomposition.cpp
@@ -248,6 +248,8 @@
   }
 
   for (DrmHwcLayer *layer : squash_layers) {
+    if (!layer->release_fence)
+      continue;
     int ret = layer->release_fence.Set(CreateNextTimelineFence());
     if (ret < 0)
       return ret;
@@ -255,6 +257,8 @@
   timeline_squash_done_ = timeline_;
 
   for (DrmHwcLayer *layer : pre_comp_layers) {
+    if (!layer->release_fence)
+      continue;
     int ret = layer->release_fence.Set(CreateNextTimelineFence());
     if (ret < 0)
       return ret;
@@ -262,6 +266,8 @@
   timeline_pre_comp_done_ = timeline_;
 
   for (DrmHwcLayer *layer : comp_layers) {
+    if (!layer->release_fence)
+      continue;
     int ret = layer->release_fence.Set(CreateNextTimelineFence());
     if (ret < 0)
       return ret;