diff options
| author | 2023-05-24 21:25:29 +0000 | |
|---|---|---|
| committer | 2023-05-24 21:25:29 +0000 | |
| commit | 384705e5517f9037da09abbbb653dfe265c87d2c (patch) | |
| tree | 925ecbf0dd3e379e9ed1da2cf599aa23bb78a42b /libs/ui/Gralloc5.cpp | |
| parent | 6f9e6a38817216b59e0039077c26bfac01c23c5d (diff) | |
| parent | 1889c6a81ef5be2b252798b2f19f8680ea0e2a02 (diff) | |
Merge "Fix USAGE_FRONT_BUFFER failure on Cuttlefish" into udc-dev am: 1889c6a81e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23413801
Change-Id: I04d7370b837acd604f2be038a218601b99623015
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/ui/Gralloc5.cpp')
| -rw-r--r-- | libs/ui/Gralloc5.cpp | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/libs/ui/Gralloc5.cpp b/libs/ui/Gralloc5.cpp index 21068394d2..c3b2d3d808 100644 --- a/libs/ui/Gralloc5.cpp +++ b/libs/ui/Gralloc5.cpp @@ -343,14 +343,17 @@ status_t Gralloc5Mapper::validateBufferSize(buffer_handle_t bufferHandle, uint32 return BAD_VALUE; } } - { - auto value = getStandardMetadata<StandardMetadataType::USAGE>(mMapper, bufferHandle); - if (static_cast<BufferUsage>(usage) != value) { - ALOGW("Usage didn't match, expected %" PRIu64 " got %" PRId64, usage, - static_cast<int64_t>(value.value_or(BufferUsage::CPU_READ_NEVER))); - return BAD_VALUE; - } - } + // TODO: This can false-positive fail if the allocator adjusted the USAGE bits internally + // Investigate further & re-enable or remove, but for now ignoring usage should be OK + (void)usage; + // { + // auto value = getStandardMetadata<StandardMetadataType::USAGE>(mMapper, bufferHandle); + // if (static_cast<BufferUsage>(usage) != value) { + // ALOGW("Usage didn't match, expected %" PRIu64 " got %" PRId64, usage, + // static_cast<int64_t>(value.value_or(BufferUsage::CPU_READ_NEVER))); + // return BAD_VALUE; + // } + // } { auto value = getStandardMetadata<StandardMetadataType::STRIDE>(mMapper, bufferHandle); if (stride != value) { |