Replace GRALLOC_USAGE_* flags with GRALLOC1 equivalents.

Jira: None.
Test: No new regressions on Android.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>

diff --git a/os/android/gralloc1bufferhandler.cpp b/os/android/gralloc1bufferhandler.cpp
index 509300c..953f500 100644 (file)
--- a/os/android/gralloc1bufferhandler.cpp
+++ b/os/android/gralloc1bufferhandler.cpp
@@ -151,8 +151,9 @@ void *Gralloc1BufferHandler::Map(HWCNativeHandle handle, uint32_t x,
 
   gralloc1_device_t *gralloc1_dvc =
       reinterpret_cast<gralloc1_device_t *>(device_);
-  uint32_t status = lock_(gralloc1_dvc, handle->imported_handle_, GRALLOC_USAGE_SW_READ_RARELY,
-          GRALLOC_USAGE_SW_READ_RARELY, &rect, map_data, acquireFence);
+  uint32_t status = lock_(
+      gralloc1_dvc, handle->handle_, GRALLOC1_PRODUCER_USAGE_CPU_WRITE_OFTEN,
+      GRALLOC1_CONSUMER_USAGE_CPU_READ_OFTEN, &rect, map_data, acquireFence);
   return (GRALLOC1_ERROR_NONE == status) ? *map_data : NULL;
 }
 

diff --git a/os/android/utils_android.h b/os/android/utils_android.h
index b810de5..bc67d0c 100644 (file)
--- a/os/android/utils_android.h
+++ b/os/android/utils_android.h
@@ -24,6 +24,7 @@
 #include <stdint.h>
 #include <drm_fourcc.h>
 #include <system/graphics.h>
+#include <hardware/gralloc1.h>
 
 #include "platformdefines.h"
 
@@ -292,9 +293,9 @@ static bool ImportGraphicsBuffer(HWCNativeHandle handle, int fd) {
     handle->meta_data_.gem_handles_[p] = id;
   }
 
-  if (gr_handle->usage & GRALLOC_USAGE_PROTECTED) {
+  if (gr_handle->usage & GRALLOC1_PRODUCER_USAGE_PROTECTED) {
     handle->meta_data_.usage_ |= hwcomposer::kLayerProtected;
-  } else if (gr_handle->usage & GRALLOC_USAGE_CURSOR) {
+  } else if (gr_handle->usage & GRALLOC1_CONSUMER_USAGE_CURSOR) {
     handle->meta_data_.usage_ |= hwcomposer::kLayerCursor;
     // We support DRM_FORMAT_ARGB8888 for cursor.
     handle->meta_data_.format_ = DRM_FORMAT_ARGB8888;