commit a9ed46acc12d7e7bb0cdaf5b53ff175156589dc9
author Victor Chong <victor.chong@linaro.org> Thu Apr 11 06:23:28 2019 +0100
committer Victor Chong <victor.chong@linaro.org> Thu Apr 11 06:49:42 2019 +0100
tree edd0b7e1dc3c03b2eeb6618cbb20da2c8c71b3a6
parent cce1278a890b8fcdb831dd8a2ba0a8826eb290c4

drm_hwcomposer: platformhisi: extend conditional of AFBC support

The AFBC modifiers in [1] are defined in aosp bionic's drm headers only
if it has been updated to v4.19 kernel headers [2]. If the version used
is older, drm_hwcomposer build will fail, so we extend the conditional
of the AFBC logic to include one of these modifiers.

[1] cc5fca4f ("drm_hwcomposer: Add support for Arm Framebuffer Compression (AFBC) modifiers.")
[2] https://android.googlesource.com/platform/bionic/+/9ce28844db7cf80ee8cf7c88dab23b666eaab739

Signed-off-by: Victor Chong <victor.chong@linaro.org>

platformhisi.cpp

diff --git a/platformhisi.cpp b/platformhisi.cpp
index d4002f1..e022010 100644
--- a/platformhisi.cpp
+++ b/platformhisi.cpp
@@ -70,7 +70,8 @@
   return 0;
 }
 
-#ifdef MALI_GRALLOC_INTFMT_AFBC_BASIC
+#if defined(MALI_GRALLOC_INTFMT_AFBC_BASIC) && \
+    defined(AFBC_FORMAT_MOD_BLOCK_SIZE_16x16)
 uint64_t HisiImporter::ConvertGrallocFormatToDrmModifiers(uint64_t flags,
                                                           bool is_rgb) {
   uint64_t features = 0UL;