commit 9fcccf5d9d5dfa91d6a7b437c39fa659e3e9c9d5
author android-build-team Robot <android-build-team-robot@google.com> Thu Jun 29 04:45:43 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Jun 29 04:45:43 2017 +0000
tree e3e517a0e90c253c6a643ceff22b2d723f2e38bc
parent 2d57034528f7e98a35926f0d453ea635513b6c6c
parent 9bf1d36aa7b5b24be6af137cd14f01e9b3ae449e

Merge cherrypicks of [2476230, 2476289, 2476272, 2476118, 2475997, 2476251, 2476119, 2476341, 2476252, 2476290, 2476232, 2476274, 2475999, 2476343, 2476275, 2476216, 2476381, 2476256, 2476000, 2476362, 2476345, 2476364, 2476234, 2476346, 2476347, 2476365, 2476276, 2476219, 2476277, 2476402, 2476348, 2476235, 2476383, 2476257, 2476278, 2476236, 2476350, 2476351, 2476307, 2476403, 2476308, 2476258] into oc-release

Change-Id: I29a05a7411f2ed49f736fd2ded0fd6f4cf453808

msm8996/sdm/libs/hwc2/hwc_layers.cpp

diff --git a/msm8996/sdm/libs/hwc2/hwc_layers.cpp b/msm8996/sdm/libs/hwc2/hwc_layers.cpp
index c6ae31b..5739b9d 100644
--- a/msm8996/sdm/libs/hwc2/hwc_layers.cpp
+++ b/msm8996/sdm/libs/hwc2/hwc_layers.cpp
@@ -84,7 +84,11 @@
 
   layer_buffer->width = UINT32(handle->width);
   layer_buffer->height = UINT32(handle->height);
+  auto format = layer_buffer->format;
   layer_buffer->format = GetSDMFormat(handle->format, handle->flags);
+  if (format != layer_buffer->format) {
+    needs_validate_ = true;
+  }
   if (SetMetaData(handle, layer_) != kErrorNone) {
     return HWC2::Error::BadLayer;
   }