From 3068d2b441270986f6624765bdd0053ede9c7d99 Mon Sep 17 00:00:00 2001 From: Jason Macnak Date: Tue, 15 Oct 2024 20:15:13 +0000 Subject: [PATCH] Revert "UPSTREAM: cros_gralloc: Avoid using masks in handle_usage()" Revert submission 3308804 Reason for revert: b/373667975 Reverted changes: /q/submissionid:3308804 Change-Id: I601a93f9a36c41327a703d4347ef6de63d4a8365 --- cros_gralloc/cros_gralloc_helpers.cc | 4 +--- cros_gralloc/cros_gralloc_helpers.h | 7 ++----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/cros_gralloc/cros_gralloc_helpers.cc b/cros_gralloc/cros_gralloc_helpers.cc index 945552c..468f179 100644 --- a/cros_gralloc/cros_gralloc_helpers.cc +++ b/cros_gralloc/cros_gralloc_helpers.cc @@ -139,9 +139,7 @@ uint64_t cros_gralloc_convert_usage(uint64_t usage) handle_usage(&usage, BUFFER_USAGE_SENSOR_DIRECT_DATA, &use_flags, BO_USE_SENSOR_DIRECT_DATA); handle_usage(&usage, BUFFER_USAGE_GPU_DATA_BUFFER, &use_flags, BO_USE_GPU_DATA_BUFFER); - handle_usage(&usage, BUFFER_USAGE_FRONT_RENDERING, &use_flags, BO_USE_FRONT_RENDERING); - handle_usage(&usage, BUFFER_USAGE_FRONT_RENDERING_PRIVATE, &use_flags, - BO_USE_FRONT_RENDERING); + handle_usage(&usage, BUFFER_USAGE_FRONT_RENDERING_MASK, &use_flags, BO_USE_FRONT_RENDERING); if (usage) { ALOGE("Unhandled gralloc usage: %llx", (unsigned long long)usage); diff --git a/cros_gralloc/cros_gralloc_helpers.h b/cros_gralloc/cros_gralloc_helpers.h index 1987eab..e8dd0a5 100644 --- a/cros_gralloc/cros_gralloc_helpers.h +++ b/cros_gralloc/cros_gralloc_helpers.h @@ -21,13 +21,10 @@ // Reserve the GRALLOC_USAGE_PRIVATE_0 bit from hardware/gralloc.h for buffers // used for front rendering. minigbm backend later decides to use // BO_USE_FRONT_RENDERING or BO_USE_LINEAR upon buffer allocaton. -#define BUFFER_USAGE_FRONT_RENDERING_PRIVATE (1U << 28) +#define BUFFER_USAGE_FRONT_RENDERING (1U << 28) // Adopt BufferUsage::FRONT_BUFFER from api level 33 -#define BUFFER_USAGE_FRONT_RENDERING (1ULL << 32) - -#define BUFFER_USAGE_FRONT_RENDERING_MASK \ - (BUFFER_USAGE_FRONT_RENDERING | BUFFER_USAGE_FRONT_RENDERING_PRIVATE) +#define BUFFER_USAGE_FRONT_RENDERING_MASK (BUFFER_USAGE_FRONT_RENDERING | (1ULL << 32)) #define CROS_GRALLOC_BUFFER_METADATA_MAX_NAME_SIZE 1024