commit 340fee6bf8bda11f63e97f65ab84e930dc7e1a1c
author Bharath <bharath@fairphone.com> Tue Aug 16 10:04:59 2022 +0530
committer Bharath <bharath@fairphone.com> Thu Aug 18 19:14:09 2022 +0530
tree b365c9001fd1dce0073e8bf1a5e840fb95a7be5d
parent 69273787904e7fcfd6b591b8371fd2fbf5580453
parent 16a3f11c6d65c9f5a624eb9a448a2a7062bc0827

Merge tag 'LA.UM.9.6.2.c26-02500-89xx.0' into int/11/fp3

"LA.UM.9.6.2.c26-02500-89xx.0"

* tag 'LA.UM.9.6.2.c26-02500-89xx.0':
  gralloc: Fix issue with mmap/munmap meta due to reserved size

Change-Id: Ie3ffc1b35c323206639f31ed02c6e0c24342057a

gralloc/QtiGrallocPriv.h

diff --git a/gralloc/QtiGrallocPriv.h b/gralloc/QtiGrallocPriv.h
index 3c9bbae..896ab22 100644
--- a/gralloc/QtiGrallocPriv.h
+++ b/gralloc/QtiGrallocPriv.h
@@ -76,9 +76,9 @@
 
 #include "QtiGrallocMetadata.h"
 
-#ifndef __QTI_DISPLAY_GRALLOC__
-#pragma message "QtiGrallocPriv.h should not be included"
-#endif
+// #ifndef __QTI_DISPLAY_GRALLOC__
+// #pragma message "QtiGrallocPriv.h should not be included"
+// #endif
 
 /*
  *

gralloc/gralloc_priv.h

diff --git a/gralloc/gralloc_priv.h b/gralloc/gralloc_priv.h
index 8410b56..e5fc120 100644
--- a/gralloc/gralloc_priv.h
+++ b/gralloc/gralloc_priv.h
@@ -26,7 +26,7 @@
 #include "QtiGrallocDefs.h"
 #include "gr_priv_handle.h"
 
-#pragma message "Warning: gralloc_priv.h is deprecated"
+// #pragma message "Warning: gralloc_priv.h is deprecated"
 
 #define GRALLOC_PROP_PREFIX  "vendor.gralloc."
 #define GRALLOC_PROP(prop_name) GRALLOC_PROP_PREFIX prop_name

libqdmetadata/qdMetaData.h

diff --git a/libqdmetadata/qdMetaData.h b/libqdmetadata/qdMetaData.h
index 8a9c390..d0c4679 100644
--- a/libqdmetadata/qdMetaData.h
+++ b/libqdmetadata/qdMetaData.h
@@ -41,9 +41,9 @@
 #include <QtiGrallocPriv.h>
 #endif
 
-#ifndef __QTI_DISPLAY_GRALLOC__
-#pragma message "qdMetaData.h is being deprecated"
-#endif
+// #ifndef __QTI_DISPLAY_GRALLOC__
+// #pragma message "qdMetaData.h is being deprecated"
+// #endif
 
 #ifdef __cplusplus
 extern "C" {