commit dc39fa6b85060095df7a5e17cd01cefa7e413c87
author John Stultz <john.stultz@linaro.org> Thu Apr 18 21:11:38 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Apr 18 21:11:38 2019 -0700
tree f336cae3596350a1d7566303442e6e4bd0618654
parent 482ad9a71e6667bc291a7900bf174a92cfab775d
parent 2a865182e52fa499412bd1fdd0d44321d3b3c6b5

Merge remote-tracking branch 'aosp/upstream-master' into HEAD am: 90cef9e6c8
am: 2a865182e5

Change-Id: I946716e9cf503a08f4244b2fb3b7c2087224572b

drmconnector.cpp

diff --git a/drmconnector.cpp b/drmconnector.cpp
index f272024..ead9312 100644
--- a/drmconnector.cpp
+++ b/drmconnector.cpp
@@ -138,13 +138,15 @@
       m.set_id(drm_->next_mode_id());
       new_modes.push_back(m);
     }
-    if (new_modes.back().type() & DRM_MODE_TYPE_PREFERRED) {
+    // Use only the first DRM_MODE_TYPE_PREFERRED mode found
+    if (!preferred_mode_found &&
+        (new_modes.back().type() & DRM_MODE_TYPE_PREFERRED)) {
       preferred_mode_id_ = new_modes.back().id();
       preferred_mode_found = true;
     }
   }
   modes_.swap(new_modes);
-  if ((!preferred_mode_found) && (modes_.size() != 0)) {
+  if (!preferred_mode_found && modes_.size() != 0) {
     preferred_mode_id_ = modes_[0].id();
   }
   return 0;

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;