Snap for 9101843 from b952672cb8e18133837a3cdd580d9f3991b92213 to tm-qpr1-release
Change-Id: I2ab164f1e0ff8c9722832b62a2f584ab270dd206
diff --git a/gralloc4/src/core/mali_gralloc_bufferallocation.cpp b/gralloc4/src/core/mali_gralloc_bufferallocation.cpp
index 7656fcf..04bf7ed 100644
--- a/gralloc4/src/core/mali_gralloc_bufferallocation.cpp
+++ b/gralloc4/src/core/mali_gralloc_bufferallocation.cpp
@@ -476,7 +476,7 @@
* (matched against `VALID_USAGE`). These should be aligned.
*/
static bool log_deprecated_usage_flags(uint64_t usage) {
- if (usage & MALI_GRALLOC_USAGE_FRONTBUFFER) {
+ if (usage & DEPRECATED_MALI_GRALLOC_USAGE_FRONTBUFFER) {
MALI_GRALLOC_LOGW("Using deprecated FRONTBUFFER usage bit, please upgrade to BufferUsage::FRONT_BUFFER");
return true;
}
@@ -980,16 +980,6 @@
return 0;
}
-static bool validate_usage(const uint64_t usage) {
- if (usage & GRALLOC_USAGE_FRONT_BUFFER) {
- /* TODO(b/218383959): Enable front buffer rendering */
- MALI_GRALLOC_LOGW("Front buffer rendering is disabled.");
- return false;
- }
-
- return true;
-}
-
int mali_gralloc_derive_format_and_size(buffer_descriptor_t * const bufDescriptor)
{
alloc_type_t alloc_type{};
@@ -998,11 +988,6 @@
int alloc_height = bufDescriptor->height;
uint64_t usage = bufDescriptor->producer_usage | bufDescriptor->consumer_usage;
- if (!validate_usage(usage)) {
- MALI_GRALLOC_LOGE("Usage flag validation failed.");
- return -EINVAL;
- }
-
/*
* Select optimal internal pixel format based upon
* usage and requested format.
diff --git a/gralloc4/src/mali_gralloc_usages.h b/gralloc4/src/mali_gralloc_usages.h
index fb3b70e..3c5a0fa 100644
--- a/gralloc4/src/mali_gralloc_usages.h
+++ b/gralloc4/src/mali_gralloc_usages.h
@@ -60,7 +60,7 @@
// TODO(b/183478446): Cleanup usage flags redefinition
typedef enum
{
- MALI_GRALLOC_USAGE_FRONTBUFFER = GRALLOC_USAGE_PRIVATE_12,
+ DEPRECATED_MALI_GRALLOC_USAGE_FRONTBUFFER = GRALLOC_USAGE_PRIVATE_12,
MALI_GRALLOC_USAGE_FORCE_BACKBUFFER = GRALLOC_USAGE_PRIVATE_13,
MALI_GRALLOC_USAGE_NO_AFBC = GRALLOC_USAGE_PRIVATE_1,
MALI_GRALLOC_USAGE_AFBC_PADDING = GRALLOC_USAGE_PRIVATE_14,
