lineage-rockchip/android_external_minigbm
1
0
Fork 0
Code Activity Actions

Revert "UPSTREAM: cros_gralloc: Avoid using masks in handle_usage()" am: 3068d2b441 am: cd7a69560b

Browse source 
Original change: https://android-review.googlesource.com/c/platform/external/minigbm/+/3309718

Change-Id: Ie2c2408e4d0467daf0bda841a4cea63900cb691c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jason Macnak 2024-10-15 22:53:11 +00:00 • committed by Automerger Merge Worker
commit 2f32f04fc4
2 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cros_gralloc/cros_gralloc_helpers.cc
View file

@ -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);

7
cros_gralloc/cros_gralloc_helpers.h
View file

@ -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