commit 692e083416b729af949ec1fa1fb28e80641d1bab
author Chia-I Wu <olv@google.com> Tue Jun 05 15:46:58 2018 -0700
committer Chia-I Wu <olv@google.com> Wed Jun 06 09:58:16 2018 -0700
tree edb2bf4513ee1542fa25bc15b2a5551540b96040
parent 169dd11cf483ebc9f127dd91fe63c540e044329e

surfaceflinger: force client composition for Y410

When the pixel format is Y410 masquerading as RGBA_1010102, always
force client composition.

Bug: 80509363
Test: no effect on Pixel devices
Change-Id: I31996eeda1559b0557a5acb53d593fd4f395ccaf

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index ce868a9..0a44f50 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -1950,14 +1950,15 @@
                      displayId, result);
         }
         for (auto& layer : display->getVisibleLayersSortedByZ()) {
-            if ((layer->getDataSpace() == Dataspace::BT2020_PQ ||
-                 layer->getDataSpace() == Dataspace::BT2020_ITU_PQ) &&
-                !display->hasHDR10Support()) {
+            if (layer->isHdrY410()) {
                 layer->forceClientComposition(displayId);
-            }
-            if ((layer->getDataSpace() == Dataspace::BT2020_HLG ||
-                 layer->getDataSpace() == Dataspace::BT2020_ITU_HLG) &&
-                !display->hasHLGSupport()) {
+            } else if ((layer->getDataSpace() == Dataspace::BT2020_PQ ||
+                        layer->getDataSpace() == Dataspace::BT2020_ITU_PQ) &&
+                    !display->hasHDR10Support()) {
+                layer->forceClientComposition(displayId);
+            } else if ((layer->getDataSpace() == Dataspace::BT2020_HLG ||
+                        layer->getDataSpace() == Dataspace::BT2020_ITU_HLG) &&
+                    !display->hasHLGSupport()) {
                 layer->forceClientComposition(displayId);
             }