Merge "hwc2: Implement display config 1.6 and 1.7 interfaces."
diff --git a/sdm/libs/hwc2/hwc_display.cpp b/sdm/libs/hwc2/hwc_display.cpp
index 99137c9..984489d 100644
--- a/sdm/libs/hwc2/hwc_display.cpp
+++ b/sdm/libs/hwc2/hwc_display.cpp
@@ -540,7 +540,9 @@
 
     Layer *layer = hwc_layer->GetSDMLayer();
     layer->flags = {};   // Reset earlier flags
-    if (hwc_layer->GetClientRequestedCompositionType() == HWC2::Composition::Client) {
+    // Mark all layers to skip, when client target handle is NULL
+    if (hwc_layer->GetClientRequestedCompositionType() == HWC2::Composition::Client ||
+        !client_target_->GetSDMLayer()->input_buffer.buffer_id) {
       layer->flags.skip = true;
     } else if (hwc_layer->GetClientRequestedCompositionType() == HWC2::Composition::SolidColor) {
       layer->flags.solid_fill = true;