Merge tag 'LA.QSSI.14.0.r1-13400-qssi.0' into staging/lineage-21.0_merge-LA.QSSI.14.0.r1-13400-qssi.0
"LA.QSSI.14.0.r1-13400-qssi.0"
# By Govind R Sekhar (2) and Tharaga Balachandran (1)
# Via Linux Build Service Account (2) and others
* tag 'LA.QSSI.14.0.r1-13400-qssi.0':
gralloc: Define UBWC_NV124R format usage
gralloc: Define UBWC_NV124R format usage
gralloc: Add plane layout component type blob
Change-Id: Ibbbbe74ceb85ddc258f82c9a4a0f6216e701a570
diff --git a/gralloc/QtiGralloc.h b/gralloc/QtiGralloc.h
index f43da3f..30ef86b 100644
--- a/gralloc/QtiGralloc.h
+++ b/gralloc/QtiGralloc.h
@@ -159,6 +159,8 @@
PlaneLayoutComponentType_Raw = {VENDOR_QTI, PLANE_COMPONENT_TYPE_RAW};
static const aidl::android::hardware::graphics::common::ExtendableType
PlaneLayoutComponentType_Meta = {VENDOR_QTI, PLANE_COMPONENT_TYPE_META};
+static const aidl::android::hardware::graphics::common::ExtendableType
+ PlaneLayoutComponentType_Blob = {VENDOR_QTI, PLANE_COMPONENT_TYPE_BLOB};
Error decodeMetadataState(hidl_vec<uint8_t> &in, bool *out);
Error encodeMetadataState(bool *in, hidl_vec<uint8_t> *out);
diff --git a/gralloc/QtiGrallocDefs.h b/gralloc/QtiGrallocDefs.h
index 1ed7102..b314d70 100644
--- a/gralloc/QtiGrallocDefs.h
+++ b/gralloc/QtiGrallocDefs.h
@@ -90,6 +90,9 @@
/* This flag is used to indicate No UBWC-P support */
#define GRALLOC_USAGE_PRIVATE_NO_UBWC_P 1ULL << 54
+/* This flag is used to indicate UBWC_NV124R format usage */
+#define GRALLOC_USAGE_PRIVATE_ALLOC_UBWC_4R 1ULL << 55
+
// OEM specific HAL formats
#define HAL_PIXEL_FORMAT_RGBA_5551 6
#define HAL_PIXEL_FORMAT_RGBA_4444 7
diff --git a/gralloc/QtiGrallocMetadata.h b/gralloc/QtiGrallocMetadata.h
index 61a4221..2e97198 100644
--- a/gralloc/QtiGrallocMetadata.h
+++ b/gralloc/QtiGrallocMetadata.h
@@ -88,6 +88,7 @@
#define PLANE_COMPONENT_TYPE_RAW 20003
#define PLANE_COMPONENT_TYPE_META 20004
+#define PLANE_COMPONENT_TYPE_BLOB 20005
#define MAX_NAME_LEN 256