commit 6e37ec1ce096c9d3af3f04f49e4168063346b646
author John Stultz <john.stultz@linaro.org> Thu Oct 17 21:08:52 2019 +0000
committer John Stultz <john.stultz@linaro.org> Thu Oct 17 21:08:52 2019 +0000
tree f60a848f168912855296c1454f87d678c97cbc94
parent 68359af4898f34d49a45f90477c72e243644db7a
parent 6a1c38d734899641821ebab935a1b15dd0117e5f

Merge remote-tracking branch 'upstream-master' into HEAD

* aosp/upstream-master:
  drm_hwcomposer: platformmeson: fix AFBC 32x8 feature support

Change-Id: Ie4f0165849f9ce7f07c000cb7d2bffbf7ccfa7e1
Signed-off-by: John Stultz <john.stultz@linaro.org>

platform/platformmeson.cpp

diff --git a/platform/platformmeson.cpp b/platform/platformmeson.cpp
index 58ec5c0..7bde5cd 100644
--- a/platform/platformmeson.cpp
+++ b/platform/platformmeson.cpp
@@ -51,15 +51,16 @@
 uint64_t MesonImporter::ConvertGrallocFormatToDrmModifiers(uint64_t flags) {
   uint64_t features = 0UL;
 
-  if (flags & MALI_GRALLOC_INTFMT_AFBC_BASIC)
-    features |= AFBC_FORMAT_MOD_BLOCK_SIZE_16x16;
+  if (flags & MALI_GRALLOC_INTFMT_AFBC_BASIC) {
+    if (flags & MALI_GRALLOC_INTFMT_AFBC_WIDEBLK)
+      features |= AFBC_FORMAT_MOD_BLOCK_SIZE_32x8;
+    else
+      features |= AFBC_FORMAT_MOD_BLOCK_SIZE_16x16;
+  }
 
   if (flags & MALI_GRALLOC_INTFMT_AFBC_SPLITBLK)
     features |= (AFBC_FORMAT_MOD_SPLIT | AFBC_FORMAT_MOD_SPARSE);
 
-  if (flags & MALI_GRALLOC_INTFMT_AFBC_WIDEBLK)
-    features |= AFBC_FORMAT_MOD_BLOCK_SIZE_32x8;
-
   if (flags & MALI_GRALLOC_INTFMT_AFBC_TILED_HEADERS)
     features |= AFBC_FORMAT_MOD_TILED;