Commit graph

275 commits

Author SHA1 Message Date
Treehugger Robot
22c6d554b2 Merge "Error when attempting to lock buffer alloc'd without CPU_ usage" into main 2024-09-25 22:09:14 +00:00
Kiyoung Kim
6210dc3d16 Define vintf_fragments as modules
Define vintf_fragments as modules if the file is shared among multiple
modules to avoid any conflicts.

Bug: 322089980
Test: aosp_cf_x86_64_phone build succeeded
Change-Id: I653ed96587445a3e0126b3eee415edce7b657939
2024-08-12 13:48:01 +09:00
Jason Macnak
4cca6f67dd Error when attempting to lock buffer alloc'd without CPU_ usage
... except when running with software rendering as apps do not
know that they would need to request additional CPU_* usage
for GPU_* usage.

Bug: b/356845188
Test: cts -m CtsNativeHardwareTestCases
Change-Id: I3536d80469d2187550558e9d02795896de4f9827
2024-08-02 08:18:36 -07:00
Jean-François Thibert
fd19358a25 Revert^2 "Merge upstream-main into main"
This reverts commit b7a9a2b7d5.

Reason for revert: Crash resolved by Ieb07b5bbc206f07f69e4afba921149f49d6fe8c4
Bug: 349870098

Change-Id: I49848f6e7311c1f44e6c988cb42107ed79da3a6b
2024-07-03 18:21:13 +00:00
Jason Macnak
b7a9a2b7d5 Revert "Merge upstream-main into main"
This reverts commit 018f7ff8fa.

Reason for revert: b/349870098

Change-Id: I942c713e4f7a24881b7ea3cff30df13a2b4a7c9c
2024-06-27 21:40:26 +00:00
Jean-Francois Thibert
018f7ff8fa Merge upstream-main into main
This includes changes I63a5352e, Ia34b7d3a, I2685813f and I07e60729

mediatek: Add MT8196
minigbm: Reduce allocation size for MT2T allocations
minigbm: #define MINIGBM_HAS_GBM_BO_GET_MAP_INFO
Add depth buffer support for virtgpu virgl

Change-Id: I125c0b751f86b217a6ffbf7ec3fd2a1ddf848461
2024-06-26 13:21:44 -04:00
Jean-Francois Thibert
6158bc1fdc Add depth buffer support for virtgpu virgl
Bug: b:347022601
Test: Ran app that export/import depth through AHB with cf

Change-Id: I07e60729b18a9f15e0d795c33c462ba4b4f255b6
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/5636740
Tested-by: Jean-François Thibert <jfthibert@google.com>
Reviewed-by: Dawn Han <dawnhan@google.com>
Commit-Queue: Jean-François Thibert <jfthibert@google.com>
Reviewed-by: Jason Macnak <natsu@google.com>
2024-06-26 15:22:27 +00:00
Jason Macnak
24a395410e Merge changes Ib8cc1147,I33f17670,Ib00873ba into main
* changes:
  gralloc: Avoid using std::optional in shared memory metadata
  gralloc: Move buffer metadata accessing into cros_gralloc_buffer
  gralloc: Move buffer metadata initialization into common layer
2024-05-15 15:50:39 +00:00
Yiwei Zhang
8291bfe6f1 minigbm: format fix
BUG=n/a
TEST=./presubmit.sh

Change-Id: Ic581ebe770c648ee344cfbe20ba6655786a2088e
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/5505015
Tested-by: Yiwei Zhang <zzyiwei@chromium.org>
Reviewed-by: Satoshi Niwa <niwa@chromium.org>
Commit-Queue: Yiwei Zhang <zzyiwei@chromium.org>
2024-05-01 08:09:45 +00:00
Roman Stratiienko
dd62167b6f cros_gralloc: Remove Android.bp files
Android.bp files are maintained in the AOSP fork repository.

Change-Id: I492e0c2154b22cd4cda85e379df2578b352c23df
Signed-off-by: Roman Stratiienko <r.stratiienko@gmail.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/4961034
Commit-Queue: Jason Macnak <natsu@google.com>
Reviewed-by: Dominik Behr <dbehr@chromium.org>
Reviewed-by: Jason Macnak <natsu@google.com>
2024-03-13 00:34:56 +00:00
Marcin Radomski
b1dc373138 Merge remote-tracking branch 'cros/main'
To pull in https://crrev.com/c/5352370 and https://crrev.com/c/5352371.

Additionally, add backend_mock.c to Android.bp. It was added in
https://crrev.com/c/4923791, and drv.c uses symbols defined there
unconditionally.

The one merge conflict was an i915->is_media_compression_enabled assert
in i915_num_planes_from_modifier [1] that was removed upstream in
https://crrev.com/c/5118242. The assertion referenced a flag that was
set through an ENABLE_INTEL_MEDIA_COMPRESSION environment variable.
There are no references to that variable in AOSP sources.

[1] https://cs.android.com/android/platform/superproject/main/+/main:external/minigbm/i915.c;l=591;drc=350c09cf0fa662928e208eb6749a1f3ca34dac9f

Bug: b/328181805
Test: lunch aosp_cf_x86_64_only_phone-trunk_staging-userdebug
Test: m && cvd start && atest SurfaceFlinger_test
Change-Id: I8faba268580ad984af92a63c47366d6a69e8c9d0
2024-03-12 14:52:29 +00:00
Jason Macnak
bca615781a gralloc: Sync with AOSP
Bug: b/321158178
Test: untested, AOSP already builds
Change-Id: I0f405f840baf3da755b39a3a3c1028ecbc0915c4
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/5258793
Commit-Queue: Jason Macnak <natsu@google.com>
Tested-by: Jason Macnak <natsu@google.com>
Reviewed-by: Dawn Han <dawnhan@google.com>
2024-02-27 18:49:17 +00:00
Jooyung Han
9c5a81e4f1 Expose .rc/.xml for CF gralloc apex
Bug: 312358547
Test: allocator HAL service works from CF
Change-Id: I0d7a58b23af1150a98856be7ad4ffc1e1efb42b8
2024-02-06 16:13:00 +09:00
Jason Macnak
3a1e511437 gralloc: Avoid using std::optional in shared memory metadata
... to ensure the metadata is trivially copyable.

Bug: b/321158178
Test: vts -m VtsHalGraphicsAllocatorAidl_TargetTest
Test: vts -m VtsHalGraphicsMapperV4_0Target
Test: vts -m VtsHalGraphicsMapperStableC_TargetTest
Change-Id: Ib8cc1147692fa1e056108987339aff3e222ab0d7
2024-01-23 13:52:17 -08:00
Jason Macnak
92eb16bb24 gralloc: Move buffer metadata accessing into cros_gralloc_buffer
... to hide cros_gralloc_buffer_metadata from the AIDL/HIDL Apis.
No functional change expected.

Bug: b/321158178
Test: vts -m VtsHalGraphicsAllocatorAidl_TargetTest
Test: vts -m VtsHalGraphicsMapperV4_0Target
Test: vts -m VtsHalGraphicsMapperStableC_TargetTest
Change-Id: I33f17670a331385b0afe0e179cab8985b7fe78b9
2024-01-23 13:52:17 -08:00
Jason Macnak
bd616875b5 gralloc: Move buffer metadata initialization into common layer
... to dedup and support upcoming change to metadata initialization.

Bug: b/321158178
Test: vts -m VtsHalGraphicsAllocatorAidl_TargetTest
Test: vts -m VtsHalGraphicsMapperV4_0Target
Test: vts -m VtsHalGraphicsMapperStableC_TargetTest
Change-Id: Ib00873babcb2ec8816b0d319e675d6884594f618
2024-01-23 13:52:14 -08:00
John Reck
46f078c8b0 Support an additional option to initialize the dataspace
Test: atest AHardwareBufferTest#Allocate2WithExtras
Change-Id: Ic0620087c331beaf758c1fb56ae6b343a1b68345
2023-12-08 14:48:09 -05:00
Yiwei Zhang
118166a788 tiny format fixes
Also absorbs:
https://android-review.git.corp.google.com/c/platform/external/minigbm/+/2768266

BUG=n/a
TEST=./presubmit.sh

Change-Id: I7b781090762ed86b0d0c6c1736d0eeea6e2058ad
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/4903262
Tested-by: Yiwei Zhang <zzyiwei@chromium.org>
Reviewed-by: Dawn Han <dawnhan@google.com>
Commit-Queue: Yiwei Zhang <zzyiwei@chromium.org>
Auto-Submit: Yiwei Zhang <zzyiwei@chromium.org>
Reviewed-by: Dominik Behr <dbehr@chromium.org>
2023-10-11 08:08:59 +00:00
Jason Macnak
6bd32d9cbf Merge remote-tracking branch 'aosp/upstream-main' into 'aosp/main'
... to pull in https://crrev.com/c/4897926.

Bug: b/300616292
Bug: b/300194143
Bug: b/294661992
Test: launch Cuttlefish, run SurfaceFlinger_test, inspect
      tracing around lifetime of cros_gralloc_driver
Change-Id: I72c9164c2194af87bab0800fd821b4bc0934f245
2023-09-28 10:31:23 -07:00
Jason Macnak
1f9a351e4f gralloc: Use std::shared_ptr for cros_gralloc_driver
... to ensure the lifetime of the underlying cros_gralloc_driver
matches those of the various Mapper* interfaces. Without this, the
the destruction of the static cros_gralloc_driver `s_instance`
could race with a potential CrosGralloc4Mapper user on another
thread which is still alive at the time of exit() (for example,
a buffer being cleaned up on a libhwbinder worker thread).

Bug: b/300616292
Bug: b/300194143
Bug: b/294661992
Test: launch Cuttlefish, run SurfaceFlinger_test, inspect
      tracing around lifetime of cros_gralloc_driver
Change-Id: Id8e2dbff471c03f7b663952524905a06cc03fbc1
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/4897926
Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org>
Tested-by: Jason Macnak <natsu@google.com>
Commit-Queue: Jason Macnak <natsu@google.com>
2023-09-28 17:11:55 +00:00
Jason Macnak
fe5c2c0171 gralloc: Upstream AIDL allocator, stablec mapper, and sepolicy
... from various developments in AOSP.

Bug: b/225198076
Test: n/a
Change-Id: I65c340cfee4a3ad3c6545f365ca60249fd338a5f
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/4897925
Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org>
Tested-by: Jason Macnak <natsu@google.com>
Commit-Queue: Jason Macnak <natsu@google.com>
2023-09-28 17:11:53 +00:00
Amit Pundir
21fc4f10c8 Merge remote-tracking branch 'aosp/upstream-main' into 'aosp/main'
* aosp/upstream-main: (27 commits)
  minigbm: add some validation check in cros_gralloc
  minigbm: update format of mediatek.c
  Revert "i915: Vertical align video encode buffers to macroblock size"
  minigbm: drv: Fix MINIGBM_DEBUG usage on Android
  mediatek: Add BO_USE_PROTECTED use_flag for gpu and video decoder
  i915: Vertical align video encode buffers to macroblock size
  Don't print verbose messages by default
  virgl: Store format modifier in blob's bo meta
  Fix convertToFenceHandle()
  minigbm: update drv_get_os_option() to try getenv() first
  Update usage to 64-bit
  virtgpu_cross_domain: fix prop query for mt8183 camera quirk
  virtgpu_virgl: use blobs for ABGR8888
  minigbm: move camera work-around
  mediatek: Add BO_USE_PROTECTED use_flag to support secure buffer allocation
  i915: prefer tile4 for non-linear scanout buffers
  i915: allow linear mapping for P010 scanout
  minigbm: remove `close_gem_handle`
  mediatek: Exclude MT8173's FP16 and 10-bit ABGR support
  minigbm: Use clflushopt if supported
  ...

Change-Id: I38fb3f2c699205f73633e07d1824c4fd48dac5f5
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
2023-07-21 10:11:44 +05:30
Amit Pundir
d046ea007f android: sepolicy: Add minigbm SELinux policies
Add default set of minigbm SELinux policies, to suppress
audit of minigbm reading vendor.minigbm.debug property,
for the devices which do not use this property.

Change-Id: I277a553e869b7a53a85ca70064c2eef110afeee2
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
2023-07-21 10:09:26 +05:30
dawnhan
a13a4ccde3 minigbm: add some validation check in cros_gralloc
1. Check if the buffer handle
   - Validate if the handle is null or not
   - Check the size of the handle to make sure it will not cause oob read/write
2. Check num_planes to make sure it matches with numFds
3. Created b/291606090 for the follow up about updating cros_gralloc_driver level api to take cros_gralloc_handle_t

BUG=b:289303132
TEST=patch the change on rvc-arc and tested with ARCVM

Change-Id: Id03ec45f928fe6db62bb1722ee0dbc6c8831fd46
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/4674736
Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org>
Commit-Queue: Dawn Han <dawnhan@google.com>
Tested-by: Dawn Han <dawnhan@google.com>
2023-07-18 07:13:59 +00:00
Jason Macnak
3957b416fa Fix convertToFenceHandle()
... to not return address to a local stack variable.

Noticed by dustingreen@

Bug: b/287536665
Test: cvd start && vts -m VtsHalGraphicsMapperV4_0Target
Change-Id: Iba486270a7ae3f8fbe50b41e3ea4c32aa0c4acad
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/4615434
Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org>
Auto-Submit: Jason Macnak <natsu@google.com>
Tested-by: Jason Macnak <natsu@google.com>
Commit-Queue: Jason Macnak <natsu@google.com>
2023-06-16 20:31:01 +00:00
Jason Macnak
966d073388 UPSTREAM: cros_gralloc: fix convertToFenceHandle()
... to not return address to local stack variable.

Upstream review: https://crrev.com/c/4615434

Bug: b/287536665
Test: cvd start && vts -m VtsHalGraphicsMapperV4_0Target
Change-Id: I1f8b5e12fc77fb30bfca8dbf712efa925f45f537
2023-06-16 09:35:00 -07:00
John Reck
21f9c36f0f Update usage to 64-bit
From aosp/2607528

Bug: 284333373
Test: Mapper5 VTS GetUsage64
Change-Id: Iff593e2a6f3f1f08bdb77314fa3ded9473c68b12
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/4574845
Auto-Submit: Jason Macnak <natsu@google.com>
Reviewed-by: Dominik Behr <dbehr@chromium.org>
Commit-Queue: Dominik Behr <dbehr@chromium.org>
Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org>
Tested-by: Jason Macnak <natsu@google.com>
2023-05-31 04:42:17 +00:00
John Reck
892756e97f Update usage to 64-bit
Bug: 284333373
Test: Mapper5 VTS GetUsage64
Change-Id: I28f10be812039f4129d32572895d20b26d11c1fe
2023-05-26 16:52:45 -04:00
Dawn Han
3940cbd883 minigbm: move camera work-around
Move mt8183_camera_quirk_ into struct cross_domain_private.
Add a helper `drv_get_os_option` in `drv_helper` to query os option.
Advertise DRM_FORMAT_MTISP_SXYZW10 as supported format in virtgpu_cross_domain.c.
Implement cross domain's own resolve_format_and_use_flags entry point.

BUG=b:269982880

TEST=tested on a kukui machine after applying the change. Camera and
screen recording works fine.

Change-Id: Ia0d6e2cc701477aa6b9542de84e24f8aeb5a29e0
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/4304961
Commit-Queue: Dawn Han <dawnhan@google.com>
Reviewed-by: Dominik Behr <dbehr@chromium.org>
Tested-by: Dawn Han <dawnhan@google.com>
2023-05-02 21:06:13 +00:00
Dawn Han
84b3a09ef0 minigbm: clean up bo.handles
The multi-planar formats are being allocated into a single plane,
and the minigbm exynos backend is dropped. So we can use `handle` instead of handles as of now.

Remove some of the helper functions that calculate the number of planes.
There is no need to check if there is more than one kernel buffer per buffer object.

Added a new function `drv_gem_close` in `drv_helpers` that can be used by `drv_gem_bo_destroy` and `drv_prime_bo_import`. It can be used to clean the unused gem_handle.

Bug=b:266776512
TEST=camera and screenshot work fine after deploying the change #strongbad
TEST=camera and screenshot work fine after deploying the change #kukui-arc-r
TEST=camera and screenshot work fine after deploying the change, tested a couple of apps in the Google Play Store, and checked file `dma_buf/bufinfo` to see there's no object leaking. #guybrush

Change-Id: Ib63559504e4cb8f1a32ae90170925146613d694f
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/4297873
Commit-Queue: Dawn Han <dawnhan@google.com>
Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org>
Tested-by: Dawn Han <dawnhan@google.com>
2023-04-09 18:57:40 +00:00
Jason Macnak
e4fc0b8356 Merge "Revert "ANDROID: gralloc: Temporarily disable PixelFormat::R_8"" 2023-04-03 21:17:26 +00:00
Jason Macnak
93ea13ea21 Revert "ANDROID: gralloc: Temporarily disable PixelFormat::R_8"
This reverts commit 87b0f9bdf8.

The necessary bits are in ANGLE and SwiftShader now.

Bug: b/259551816
Change-Id: I851a4102d0a4edda37dc6b3741bab70dd056c262
Test: cvd start --gpu_mode=guest_swiftshader
Test: atest librenderengine_test
Test: cts -m CtsNativeHardwareTestCases
2023-03-31 20:58:03 +00:00
Yiwei Zhang
ea61838d9b Merge remote-tracking branch 'cros/main' into 'aosp/master'
Bug: 273794453
Test: build
Change-Id: Ie66e6c5026f2151ea7f38d7aef080350ec0f7bce
2023-03-15 21:11:03 +00:00
Dawn Han
e0983035ca minigbm: fix format
Correct the formats in cros_gralloc_driver.

Bug=N/A
TEST=N/A

Change-Id: I59bc09ee04dd05ffbd83243d6c071eb018facab2
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/4324140
Tested-by: Dawn Han <dawnhan@google.com>
Commit-Queue: Dawn Han <dawnhan@google.com>
Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org>
2023-03-15 02:25:38 +00:00
Yiwei Zhang
7997ad203b cros_gralloc: restrict DRM_FORMAT_MTISP_SXYZW10 to non-scanout
BUG=b:271382698
TEST=cts

Change-Id: Ia81decf01c3254bc61887e2070d9307d6f1f82c6
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/4317163
Auto-Submit: Yiwei Zhang <zzyiwei@chromium.org>
Reviewed-by: Dawn Han <dawnhan@google.com>
Reviewed-by: Lina Versace <chadversary@chromium.org>
Tested-by: Yiwei Zhang <zzyiwei@chromium.org>
2023-03-08 17:29:01 +00:00
Chia-I Wu
9f36afc60a cros_gralloc: use drv_preload
Help GraphicBufferMapper::preloadHal() preload the dri driver as well.

BUG=b:269664560
TEST="grep radeonsi /proc/$(pidof zygote)/maps" on grunt

Change-Id: I8bd4f7355840162c29958ccd98246e587b9caae7
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/4262035
Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org>
Tested-by: Chia-I Wu <olv@google.com>
Commit-Queue: Chia-I Wu <olv@google.com>
2023-02-21 19:57:35 +00:00
Yiwei Zhang
49756130de Merge remote-tracking branch 'cros/main' into 'aosp/master'
Bug: 158617858
Bug: 174146421
Bug: 269565421
Test: CtsNNAPITestCases and CtsCameraTestCases
Change-Id: Ifca6fd0c2dcfcfc3426441f13cd04b8ba02b21ac
2023-02-20 22:59:22 +00:00
Yiwei Zhang
b377924a7b minigbm: format fix and add missing header
BUG=n/a
TEST=build

Change-Id: Id2dac9a25190ba8ee05f42ef3a4ff8a1e3965844
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/4269511
Reviewed-by: Satoshi Niwa <niwa@chromium.org>
Commit-Queue: Yiwei Zhang <zzyiwei@chromium.org>
Tested-by: Yiwei Zhang <zzyiwei@chromium.org>
Auto-Submit: Yiwei Zhang <zzyiwei@chromium.org>
2023-02-20 22:49:46 +00:00
David Stevens
3e300b638a gralloc: add workaround for MT8183 private format
Add support for the MT8183 private camera format to gralloc. This is
done as a vendor specific workaround that bypasses the normal minigbm
format resolution, targeting kukui+ARCVM.

This is aimed at working around the fact that the virtgpu cross domain
backend needs to directly resolve formats itself. Proper support for
involving the host when resolving formats would be cleaner. However,
that would be a substantial amount of work for what is (hopefully) a
one-off situation.

BUG=b:158617858
TEST=testBasicOpaqueToJpegReprocessing on kukui-arc-r DUT

Change-Id: I8e1d74aac0a16babd7d7e2e630ff8affb3104e8b
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/4258986
Tested-by: David Stevens <stevensd@chromium.org>
Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org>
Commit-Queue: David Stevens <stevensd@chromium.org>
2023-02-20 05:13:54 +00:00
Dawn Han
d77e164105 minigbm: Relax the validateBufferSize check
Blob formats (aka buffers) get represented as R8 textures with height
of one and width==size. These have no particular stride requirement,
even though the host might ask for a pitch that would make sense for
a 2D R8 texture with height greater than one.

Relax the validateBufferSize check for format_blob rather than set the
stride. As blob defined: buffers of this format must have a height of
1, so height doesn't need to be checked specifically.

BUG=b:269565421
TEST=CQ

Change-Id: I7a8d4dbf292330df0c24b502abd9dbf3dceac728
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/4263402
Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org>
Tested-by: Yiwei Zhang <zzyiwei@chromium.org>
2023-02-20 04:00:05 +00:00
Chia-I Wu
52fca9c2cd minigbm: add minigbm_create_default_device helper
Variants of minigbm_create_default_device are open-coded in multiple
places.  This should be used wherever minigbm can be assumed.

BUG=none
TEST=manual check that the function works

Change-Id: I3ad9897355ab72080fdca329674df09087b9adfd
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/4163418
Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org>
Tested-by: Chia-I Wu <olv@google.com>
Commit-Queue: Chia-I Wu <olv@google.com>
2023-02-06 22:54:56 +00:00
Yifan Hong
7e51929822 Drop <name>I</name> from mapper HAL.
libvintf now supports empty interface names for native HALs.

Test: TH
Bug: 264267049
Change-Id: I4b2b1ae8805c31407155ab66b5602612762467f1
2023-01-17 15:24:39 -08:00
John Reck
cafa9ecee7 Merge "Add standardized VERSION symbol" 2023-01-09 18:38:26 +00:00
Treehugger Robot
1a62da1e40 Merge changes from topic "allocatorv2options"
* changes:
  Support Allocator-V2 additionalOptions
  Fix name size assert to not require constexpr ctor
2023-01-09 08:05:54 +00:00
John Reck
3bd679422b Add standardized VERSION symbol
For VINTF validation

Test: make
Change-Id: I4370d2b5e93186331a7db0ae20d4f9abe7834b04
2023-01-06 17:40:39 -05:00
John Reck
992fd592e1 Merge "Implement STRIDE query" 2023-01-06 19:38:30 +00:00
Yiwei Zhang
20ea534303 Merge "Merge remote-tracking branch 'cros/main' into 'aosp/master'" 2023-01-03 17:49:50 +00:00
Steven Moreland
9dcac98394 add VINTF manifest entry
Bug: 256701991
Test: vts_treble_vintf_vendor_test
Change-Id: If03a5b871b14a3f477daeabf4456a3031a2743a5
2022-12-22 03:27:13 +00:00
John Reck
c825ea1c7c Support Allocator-V2 additionalOptions
CF doesn't support any additional options, so just reject
anything set on it.

Test: VtsHalGraphicsAllocatorAidl_TargetTest
Bug: 257075040
Change-Id: If86790bee805af27c2bf6fda3ed2b18351f5fd38
2022-12-19 16:37:56 -05:00
John Reck
306b292beb Fix name size assert to not require constexpr ctor
Test: make
Change-Id: I3581411230e5fb3281c6ffa768020755ea50f08f
2022-12-19 15:41:47 -05:00