Merge "commonsys-intf-display: add support for early notify metadata"
diff --git a/gralloc/QtiGrallocDefs.h b/gralloc/QtiGrallocDefs.h
index eeac478..efac776 100644
--- a/gralloc/QtiGrallocDefs.h
+++ b/gralloc/QtiGrallocDefs.h
@@ -29,6 +29,11 @@
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause-Clear
+ */
+
#ifndef __QTIGRALLOCDEFS_H__
#define __QTIGRALLOCDEFS_H__
@@ -128,6 +133,9 @@
#define HAL_PIXEL_FORMAT_NV12_UBWC_FLEX_2_BATCH 0x128
#define HAL_PIXEL_FORMAT_NV12_UBWC_FLEX_4_BATCH 0x129
#define HAL_PIXEL_FORMAT_NV12_UBWC_FLEX_8_BATCH 0x130
+#define HAL_PIXEL_FORMAT_NV12_FLEX_2_BATCH 0x140
+#define HAL_PIXEL_FORMAT_NV12_FLEX_4_BATCH 0x141
+#define HAL_PIXEL_FORMAT_NV12_FLEX_8_BATCH 0x142
// FSC Formats
#define HAL_PIXEL_FORMAT_RGB888_UBWC_FSC 0x131
diff --git a/gralloc/gralloc_priv.h b/gralloc/gralloc_priv.h
index 8750c3c..7d9019d 100644
--- a/gralloc/gralloc_priv.h
+++ b/gralloc/gralloc_priv.h
@@ -73,7 +73,7 @@
#define USE_SYSTEM_HEAP_FOR_SENSORS GRALLOC_PROP("use_system_heap_for_sensors")
#define ROUND_UP_PAGESIZE(x) roundUpToPageSize(x)
-inline int roundUpToPageSize(int x) {
+inline size_t roundUpToPageSize(size_t x) {
return (x + (getpagesize() - 1)) & ~(getpagesize() - 1);
}