From 7388f47bb3ed774f5a7bca7580d4039e9b8e2ee3 Mon Sep 17 00:00:00 2001
From: Karthi kandasamy <kartka@codeaurora.org>
Date: Tue, 17 Sep 2019 12:24:17 +0530
Subject: [PATCH] gralloc: Use actual layer count from buffer descriptor

Use actual layer count passed in buffer descriptor for size
calculation in ValidateBufferSize and AllocateBUffer API.

Change-Id: I8a5bd8196cd3e34da5c24a111ced4161d6be6b1e
Signed-off-by: Karthi kandasamy <kartka@codeaurora.org>
---
 gralloc/gr_buf_mgr.cpp     | 1 +
 gralloc/gr_device_impl.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/gralloc/gr_buf_mgr.cpp b/gralloc/gr_buf_mgr.cpp
index cd9de70e..068e0700 100644
--- a/gralloc/gr_buf_mgr.cpp
+++ b/gralloc/gr_buf_mgr.cpp
@@ -499,6 +499,7 @@ int BufferManager::AllocateBuffer(const BufferDescriptor &descriptor, buffer_han
   unsigned int alignedw, alignedh;
   int buffer_type = GetBufferType(gralloc_format);
   BufferInfo info = GetBufferInfo(descriptor);
+  info.layer_count = static_cast<int>(layer_count);
   GetBufferSizeAndDimensions(info, &size, &alignedw, &alignedh);
   size = (bufferSize >= size) ? bufferSize : size;
 
diff --git a/gralloc/gr_device_impl.cpp b/gralloc/gr_device_impl.cpp
index 1e068e0c..837b2172 100644
--- a/gralloc/gr_device_impl.cpp
+++ b/gralloc/gr_device_impl.cpp
@@ -555,9 +555,9 @@ gralloc1_error_t GrallocImpl::ValidateBufferSize(gralloc1_device_t *device,
                                     static_cast<int>(descriptor_info.format),
                                     static_cast<gralloc1_producer_usage_t>(descriptor_info.producerUsage),
                                     static_cast<gralloc1_consumer_usage_t>(descriptor_info.consumerUsage));
+    info.layer_count = static_cast<int>(descriptor_info.layerCount);
     err = dev->buf_mgr_->ValidateBufferSize(hnd, info);
   }
-
   return err;
 }