summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-03-06Merge Android 14 QPR2 to AOSP mainHEADmastermainXin Li
Bug: 319669529 Merged-In: I4216757468b9304fb354a44a9555b53d2e3ecb2c Change-Id: I9f1ded871cfb0802d06be1d338ddc468a6f6600d
2024-01-17Merge Android 24Q1 Release (ab/11220357)temp_319669529Xin Li
Bug: 319669529 Merged-In: Ia09a914932b585ebba0b38fbfebdf75d6d9a7a76 Change-Id: I4216757468b9304fb354a44a9555b53d2e3ecb2c
2023-12-14Merge "Revert "Use memfd on placeholder buffers"" into mainSean Callanan
2023-12-13Revert "Use memfd on placeholder buffers"Sean Callanan
Revert submission 25548829-placeholder-use-memfd Reason for revert: b/315351672 Reverted changes: /q/submissionid:25548829-placeholder-use-memfd Change-Id: Ia09a914932b585ebba0b38fbfebdf75d6d9a7a76
2023-12-12Merge "Fix errors in Allocator::isSupported" into mainDevika Krishnadas
2023-12-12Fix errors in Allocator::isSupportedDevika Krishnadas
Bug: 315883761 Test: VtsHalGraphicsAllocatorAidl_TargetTest Change-Id: I5bcbb2edb38d86e0016e66aff8f9ff5713f162d0 Signed-off-by: Devika Krishnadas <kdevika@google.com>
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: c8a041c524 -s ours am: ↵Xin Li
6734490de1 -s ours am: b669f85665 -s ours am skip reason: Merged-In I343a1e01dad2db510a57345b6f432af1a519bdcb with SHA-1 caa8cb4c69 is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/google/gchips/+/2866415 Change-Id: I5a9d593e32f9fff1c6983fb515646713168a42e2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: c8a041c524 -s ours am: ↵Xin Li
6734490de1 -s ours am skip reason: Merged-In I343a1e01dad2db510a57345b6f432af1a519bdcb with SHA-1 caa8cb4c69 is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/google/gchips/+/2866415 Change-Id: Iec9a0709d82b9b9548f3bdcebfb2e97aa82bcc17 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: c8a041c524 -s oursXin Li
am skip reason: Merged-In I343a1e01dad2db510a57345b6f432af1a519bdcb with SHA-1 caa8cb4c69 is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/google/gchips/+/2866415 Change-Id: Id988ff5c8dcba871c3af69f1948a2422c456e30e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08Merge "gralloc4: Allow GPU to read RAW12" into mainTreehugger Robot
2023-12-08gralloc4: Allow GPU to read RAW12Ankit Goyal
Bug: 309685681 Test: b/309685681#comment2 Change-Id: Ic341e6f9deb1b21f5dafb5f5124ba699acb61bd9
2023-12-08Merge Android 14 QPR1Xin Li
Merged-In: I343a1e01dad2db510a57345b6f432af1a519bdcb Bug: 315507370 Change-Id: Iadeb6a1676c24ddf69b77c34adc3a0aa4e1c2fe7
2023-12-08Merge "gralloc4: Warn about invalid usage (rather than error)" into mainTreehugger Robot
2023-12-07gralloc4: Warn about invalid usage (rather than error)Ankit Goyal
Bug: 315351672 Test: Builds Change-Id: I229a771f5bc7028242736ad6f8ed725eef4f91a3
2023-12-05Use memfd on placeholder buffersDevika Krishnadas
Bug: 314828124 Test: aion_test, video smoke test, camera smoke test Change-Id: I7d9873a3bc19381d4aec345c04de2c7e9a6e2655 Signed-off-by: Devika Krishnadas <kdevika@google.com>
2023-11-20BufferAccess inputs should be width/height and not right/leftDevika Krishnadas
Bug: 311658952 Change-Id: I0e18f866f9f6db136141210b07321cd4fe466726 Signed-off-by: Devika Krishnadas <kdevika@google.com>
2023-11-13Merge "Revert "Add post-submit test for gralloc"" into mainTreehugger Robot
2023-11-13Gralloc4: Common Mapper code should not depend on hidlDevika Krishnadas
Bug: 287532965 Test: VtsHalGraphicsMapperV4_0TargetTest Change-Id: I92154b051437eeee3835e7f5bbd3bdc920444053 Signed-off-by: Devika Krishnadas <kdevika@google.com>
2023-11-09Revert "Add post-submit test for gralloc"Devika Krishnadas
This reverts commit ee05c7d45190085476a61abbea4b3ca341627678. Reason for revert: <IRuns on virtual devices that do not use this gralloc> Change-Id: I0322203d15f0e7748aef979a4653b8ab884d33a5
2023-11-08Revert^2 "gralloc4: Upgrade Allocator to AIDL2"Devika Krishnadas
b04e88e3f68b9d6f42bbde910756380386663a68 Bug: 287353739 Test: VtsHalGraphicsMapperV4_0TargetTest Change-Id: I11acdf0240f7429c41697745201438fd17c403f5
2023-11-06Merge changes from topic "b/308432951" into mainJoerg Wagner
* changes: Preserve as many error codes as possible in map/unmap paths. Correct the error check on the lockBuffer path
2023-11-06Preserve as many error codes as possible in map/unmap paths.Jörg Wagner
While the given implementation only returns -EINVAL or GRALLOC1_ERROR_UNSUPPORTED from the backend functions we don't have to drop the latter. Though -EINVAL can't be preserved as long as the return Error is strongly typed and the type not extended. Bug: 308432951 Test: New PTS EGLAHBLockTest Change-Id: I066270d4d026e31fbf3e080cfa839236a4d7297f
2023-11-01Correct the error check on the lockBuffer pathJörg Wagner
The backend can return -EINVAL or a (positive) gralloc error code. Account for it. Bug: 308432951 Test: New PTS EGLAHBLockTest Change-Id: I992af22eae67926c796d2eff072db108f7406be2
2023-10-23gralloc4: Add support for faeval-secure heapAnkit Goyal
Bug: 302685353 Test: Manually tested with buffer dump Change-Id: I4273cee408caae3a1ab840e4e61ad0005608466d
2023-10-21Allocate placeholder buffers for metadata-only allocationsDevika Krishnadas
Bug: 295191668 Test: aion_test Test: CtsCameraTestCases Change-Id: I65e3b79b2875ddbacd70dffa1cc2154b586010b7 Signed-off-by: Devika Krishnadas <kdevika@google.com>
2023-10-20Revert "Support Dry allocation"Devika Krishnadas
This reverts commit 04d757f3a582db8f656513fdee6155ef22837566. Reason for revert: modify patch logic Change-Id: I328f2e716340c05ede73a78ca5e1b4ce5ac4a223
2023-10-19[automerger skipped] Merge 10952656 am: caa8cb4c69 -s ours am: fe139135bd -s ↵Xin Li
ours am skip reason: Merged-In I23488ea79c90981f48d69aead0bcdfa13f85af48 with SHA-1 550f1c5de7 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/gchips/+/25093240 Change-Id: Ibad1c9865d0b873a2ecbaf8e7fd8a3f2db734f9b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19[automerger skipped] Merge 10952656 am: caa8cb4c69 -s oursXin Li
am skip reason: Merged-In I23488ea79c90981f48d69aead0bcdfa13f85af48 with SHA-1 550f1c5de7 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/gchips/+/25093240 Change-Id: I35b7b3af7cc902d22f11309272e13460215a8f59 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-18Support Dry allocationDevika Krishnadas
Bug: 295191668 Test: aion_test Test: CtsCameraTestCases Change-Id: Iaee32ab37f9a65d19342cc606b47a87ae30ed12b Signed-off-by: Devika Krishnadas <kdevika@google.com>
2023-10-17Merge 10952656tmp_amf_315507370Xin Li
Merged-In: I23488ea79c90981f48d69aead0bcdfa13f85af48 Change-Id: I343a1e01dad2db510a57345b6f432af1a519bdcb
2023-10-09Merge changes from topic "metadata-encode-decode" into mainAnkit Goyal
* changes: libvendorgraphicbuffer: Use mapper::get for pixel metadata gralloc4: Use standard encode/decode
2023-10-07[automerger skipped] Merge Android 14 am: 24c0be88a8 -s ours am: aa84f26d71 ↵Xin Li
-s ours am: f340796258 -s ours am: 49c2ff2e64 -s ours am: 550f1c5de7 -s ours am skip reason: Merged-In I2c25ac813d32aa6b03d1744209963c17cd882ce3 with SHA-1 69d6c42872 is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/google/gchips/+/2776022 Change-Id: I93b521d302f4f351e7f9654a602c9a4aaa7a4f00 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06libvendorgraphicbuffer: Use mapper::get for pixel metadataAnkit Goyal
Bug: 176048725 Test: Boot to home Test: Custom logs in the graphics driver Change-Id: I8760dacef8cacd16f41e8e242587e7bc88ee1830
2023-10-06gralloc4: Use standard encode/decodeAnkit Goyal
Bug: 176048725 Test: Boot to home Test: Custom logs in the graphics driver Change-Id: Idc5ddf3b6379b48153bc3b86df28007522f2e5fb
2023-10-06[automerger skipped] Merge Android 14 am: 24c0be88a8 -s ours am: aa84f26d71 ↵Xin Li
-s ours am: f340796258 -s ours am: 49c2ff2e64 -s ours am skip reason: Merged-In I2c25ac813d32aa6b03d1744209963c17cd882ce3 with SHA-1 69d6c42872 is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/google/gchips/+/2776022 Change-Id: I23488ea79c90981f48d69aead0bcdfa13f85af48 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 24c0be88a8 -s ours am: aa84f26d71 ↵Xin Li
-s ours am: f340796258 -s ours am skip reason: Merged-In I2c25ac813d32aa6b03d1744209963c17cd882ce3 with SHA-1 69d6c42872 is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/google/gchips/+/2776022 Change-Id: I7531d18d525760fb325b80dd50305aa9192b3653 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 24c0be88a8 -s ours am: aa84f26d71 ↵Xin Li
-s ours am skip reason: Merged-In I2c25ac813d32aa6b03d1744209963c17cd882ce3 with SHA-1 69d6c42872 is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/google/gchips/+/2776022 Change-Id: I7bdaaa6e10ea8804932c7b95f52254114f219492 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 24c0be88a8 -s oursXin Li
am skip reason: Merged-In I2c25ac813d32aa6b03d1744209963c17cd882ce3 with SHA-1 69d6c42872 is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/google/gchips/+/2776022 Change-Id: Ifbada46be4b1ba0661f6ead43645129dbbf2bb91 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05Merge Android 14Xin Li
Bug: 298295554 Merged-In: I2c25ac813d32aa6b03d1744209963c17cd882ce3 Change-Id: I6230c2689bac962ee17c3a7c8c86e0ef7417c074
2023-10-02gralloc4: Fix possible overflow in dmabuf_sanity_check()Guus Sliepen
Bug: 252764814 Test: manual verification using poc Change-Id: Iff2e22fe28b854d3058d136e8222862c2f0c05f7
2023-09-29Add post-submit test for grallocDevika Krishnadas
Bug: 274647426 Change-Id: I52b5d92ac581905dc757103c5732b50c348c022d Signed-off-by: Devika Krishnadas <kdevika@google.com>
2023-09-25Merge "gralloc4: Implement new metadata to get dma buf fds" into mainShashank Sharma
2023-09-19gralloc4: Remove PAGE_SIZE 4096 assumptionKalesh Singh
bionic provides PAGE_SIZE macro which hard codes the page-size to 4096. PAGE_SIZE is being removed as no other libc provides this and Android is moving towards being page-size-agnostic. Make gralloc query the page size form the auxillary vector using getpagesize() instead. Remove unused round_up_to_page_size() function. Bug: 301096752 Test: manual; build page agnostic target Change-Id: Id857b982587fdfeaafc7be5785ddade966b30841 Signed-off-by: Kalesh Singh <kaleshsingh@google.com>
2023-09-15gralloc4: Implement new metadata to get dma buf fdsShashank Sharma
This will allow us to decouple gralloc config interface from gralloc4 private_handle_t. Bug: 176048725 Test: Boots to homescreen Change-Id: Iaed7e94b8f0907787fb3f089850801c2bb427b65 Signed-off-by: Shashank Sharma <shawshanks@google.com>
2023-09-12Match logging numeric format with the log messageVadim Caen
Some log messages were prepending 0x for decimal values. This CL changes the logging format for width, height and stride to be shown in decimal without prepending the 0x (hexadecimal) prefix Test: N/A Log message only Bug: N/A Change-Id: Ica9e8ff92cb80f59b4e2aec023dec268cc8ff610
2023-09-06[automerger skipped] gralloc4: Defer metadata mmap and remove metadata vaddr ↵Ankit Goyal
from handle am: 1881b96025 am: 7c17468f01 -s ours am skip reason: Merged-In I559bb9081bc51fdf2d304b5cde17ac4f8cf1e138 with SHA-1 c3daffd8ba is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/gchips/+/24591226 Change-Id: I577e5b36dedc7363eb989e9bdf50920b8e2fc2ef Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06[automerger skipped] gralloc4: Remove bases from handle am: c1e1d2bab8 am: ↵Ankit Goyal
da0e4dd426 -s ours am skip reason: Merged-In I0a0a071c5fc6e304c025a53217cd798452b0c2c3 with SHA-1 5fb0d18fd7 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/gchips/+/24591225 Change-Id: I07c07f8a64353ddb3525ac16e4af1ee199518288 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06[automerger skipped] libvendorgraphicbuffer: Use metadata queries for custom ↵Ankit Goyal
video metadata am: 209febd48d am: 91526913df -s ours am skip reason: Merged-In I264b1a83a5d7b2d5de04db7b0f56da95f8d41873 with SHA-1 cacbca63fa is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/gchips/+/24631782 Change-Id: I814464a214573c97b409e21e2c6c336027832fc1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06[automerger skipped] gralloc4: Add support for custom video metadata am: ↵Ankit Goyal
df7da80f6d am: 2a04fe4559 -s ours am skip reason: Merged-In I5a9e7b8a336f26705660c9e5986957c4fa6e8e0e with SHA-1 bc54b13809 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/gchips/+/24631781 Change-Id: I7623593e4a09ea52cdb8bb67ae989d377517c616 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06[automerger skipped] libvendorgraphicbuffer: Remove implementation for ↵Ankit Goyal
get_video_metadata_fd am: 47b9d743df am: 58ff398f6a -s ours am skip reason: Merged-In Ifaf08a4073f90ae02b4417b437ba1389f3256528 with SHA-1 adbaea9738 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/gchips/+/24631780 Change-Id: Ib008fae4109ff7bfdac9a1f9fe5ac0b14339f314 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 06:24:41 +0000