resolved conflicts for merge of 88f05e8d to master

Change-Id: Ib18aebd1c0f4f3ace3d7307109fcc6ae5c7a7d65

diff --cc libhwc/hwc.cpp
index e210fc2ccdf7cb519c3f85a7c95c099c8c997021,1a3d4a5768bfeef27daec698a47f7a12cc43e34d..a50a448f7dc266818adfb78060167adeb44f69bd
--- 1/libhwc/hwc.cpp
--- 2/libhwc/hwc.cpp
+++ b/libhwc/hwc.cpp
@@@ -1582,23 -1581,16 +1603,25 @@@ static int exynos5_set_hdmi(exynos5_hwc
          }
  
          if (layer.compositionType == HWC_FRAMEBUFFER_TARGET) {
-             if (!layer.handle)
-                 continue;
+             if (pdev->hdmi_fb_needed && layer.handle) {
+                 ALOGV("HDMI FB layer:");
+                 dump_layer(&layer);
  
-             ALOGV("HDMI FB layer:");
-             dump_layer(&layer);
+                 private_handle_t *h = private_handle_t::dynamicCast(layer.handle);
+                 hdmi_show_layer(pdev, pdev->hdmi_layers[1]);
+                 hdmi_output(pdev, pdev->hdmi_layers[1], layer, h, layer.acquireFenceFd,
+                                                                  &layer.releaseFenceFd);
 +
-             private_handle_t *h = private_handle_t::dynamicCast(layer.handle);
-             hdmi_output(pdev, pdev->hdmi_layers[1], layer, h, layer.acquireFenceFd,
-                                                              &layer.releaseFenceFd);
-             fb_layer = &layer;
-             if (contents->retireFenceFd < 0)
-                 contents->retireFenceFd = dup_or_warn(layer.releaseFenceFd);
-             else {
-                 int merged = merge_or_warn("hdmi",
-                         contents->retireFenceFd, layer.releaseFenceFd);
-                 close(contents->retireFenceFd);
-                 contents->retireFenceFd = merged;
++                if (contents->retireFenceFd < 0)
++                    contents->retireFenceFd = dup_or_warn(layer.releaseFenceFd);
++                else {
++                    int merged = merge_or_warn("hdmi",
++                            contents->retireFenceFd, layer.releaseFenceFd);
++                    close(contents->retireFenceFd);
++                    contents->retireFenceFd = merged;
++                }
+             } else {
+                 hdmi_hide_layer(pdev, pdev->hdmi_layers[1]);
              }
          }
      }