Commit graph

418 commits

Author SHA1 Message Date
Xin Li
c371fcd552 DO NOT MERGE - Merge RQ1A.201205.011
Bug: 172690556
Merged-In: I3962ede51ce823368c62c4e4e5fb30f7a5680bdf
Change-Id: Ia68bf79ad9a0782e2818a2abfda69ad0d2122101
2020-12-07 00:39:42 -08:00
Ady Abraham
93de2043a8 composer: fix 2.4 vts for multi-display
Fix the way the test handles multi-displays by caching
all the hotplug events received when registering the callback

Test: VTS on Pixel 4
Bug: 174174253
Change-Id: I9a69b18bcef0722e603f2ca58cfbd176ea60f5f2
Merged-In: I9a69b18bcef0722e603f2ca58cfbd176ea60f5f2
2020-12-03 18:21:40 +00:00
Treehugger Robot
1d8b9fc0b7 Merge "Support waiting for surfaceflinger service to stop before test starts" 2020-12-02 07:43:07 +00:00
Marin Shalamanov
37c5495c52 Clarify the ComposerClient comment for CONFIG_GROUP
Clarify that configs with the same group should differ only
by refresh rate.

Test: n/a
Merged-In: I2b09689825fc9564665324ff18eb1907765b9016
Change-Id: I2b09689825fc9564665324ff18eb1907765b9016
2020-11-19 10:49:53 +00:00
Dan Shi
e25724e411 Support waiting for surfaceflinger service to stop before test starts
Bug: 168787663
Test: atest VtsHalGraphicsComposerV2_1TargetTest \
  VtsHalGraphicsComposerV2_2TargetTest \
  VtsHalGraphicsComposerV2_3TargetTest
Change-Id: I1219b8446ca3ac3d22f3fd6ab72cd8a214f55545
2020-11-03 11:33:01 -08:00
Ana Krulec
564eab6f01 Moving composer@2.1 library away from shared
Adding the ability for tests to add
"android.hardware.graphics.composer@2.1-resources" as
as static library.

Test: atest sffakehwc_test on cuttlefish on aosp-master
Bug: 160796914
Change-Id: I8cb80102bd836f8f211602cb36fd857757e8323c
2020-11-02 18:07:37 -08:00
Ady Abraham
1019a17a92 composer: hold a sp<IComposer> from the service itself
IComposerClient assumes that IComposer will outlive its life cycle
and holds a simple pointer to HwcHal. This change is taking the same
approach of newer composer versions (2.2, 2.3, and 2.4) to make sure
that IComposer would outlive IComposerClient.

Test: coral booting with this change
Fixes: 155769496
Change-Id: I3962ede51ce823368c62c4e4e5fb30f7a5680bdf
Merged-In: I3962ede51ce823368c62c4e4e5fb30f7a5680bdf
(cherry picked from commit 43e42ff6ec)
(cherry picked from commit 1368c29213)
2020-10-13 01:08:04 +00:00
Dan Shi
f2b950f470 Rename vts-core to vts
Bug: 151896491
Test: none
Change-Id: If74547c56b46ebc7fd728c1bf52fe9dedac65ffa
Merged-In: I562b4dc50765e953800a814a8fd84a01c1b9352b
2020-09-26 04:11:28 +00:00
Dan Shi
ac9cf4482b Suppress gtest error for tests without any instance
Bug: 162052785
Test: m -j vts
Change-Id: I627d6790aa08aa9c6e3c5b8bdc533213ee08de21
Merged-In: I627d6790aa08aa9c6e3c5b8bdc533213ee08de21
2020-09-11 11:02:25 -07:00
Ady Abraham
8c33403a10 composer: 2.4: fix VTS usage of desired time am: 30d2573834
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12171999

Change-Id: I41b741a51c52e8e09e20e2dbd7f46c2b2238f840
2020-07-16 21:15:52 +00:00
Ady Abraham
30d2573834 composer: 2.4: fix VTS usage of desired time
Test_setActiveConfigWithConstraints is setting the desired time
for a config change to be before the test starts.
This causes the test to use the same value for all configurations,
which becomes stale the more configurations the device supports.
This fix is setting the desired time before calling
to setActiveConfigWithConstraints.

Bug: 161023185
Test: adb shell data/nativetest64/VtsHalGraphicsComposerV2_4TargetTest/VtsHalGraphicsComposerV2_4TargetTest
Change-Id: I236e5c9c16b4ba730677cd4c980a7071ba25840e
2020-07-16 20:00:44 +00:00
TreeHugger Robot
4b90115190 Merge "composer: 2.4: VTS using old value for parameter" into rvc-dev am: 32e3cd9a02
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12143287

Change-Id: I4e4e31b8d71af30dbc6aac64564b00d166a14a87
2020-07-14 19:15:46 +00:00
Ady Abraham
0a19601eae composer: 2.4: VTS using old value for parameter
Fix a test that is using the incorrect parameter.

Bug: 161023185
Test: adb shell data/nativetest64/VtsHalGraphicsComposerV2_4TargetTest/VtsHalGraphicsComposerV2_4TargetTest
Change-Id: I8574abed50c23657f5d96e9d396709cb9b92e1fd
2020-07-13 23:30:05 +00:00
Jooyung Han
d18cba85fe update hidl .bp
HIDL libs are not necessarily part of VNDK now. Because some are
used by VNDK libs, they are still VNDK. But rest are now just
vendor-available.

.hidl_for_test files are also removed because they are used to exclude
test-purpose hidl libs from VNDK libs.

Instead, .hidl_for_system_ext files are added to tests/lazy to
distinguish them from others which are installed /system.

Bug: 143933769
Test: update-makefiles.sh && m com.android.vndk.current
Merged-In: Ia81312dda340b6b5cbdd7a3c21e1d323bda39a4a
Change-Id: Ia81312dda340b6b5cbdd7a3c21e1d323bda39a4a
(cherry picked from commit b0907a6bb8)
2020-07-02 12:26:37 +09:00
Naseer Ahmed
5f9995dc9a Do not link mapper libraries statically am: fbcb5a89c9
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/11970027

Change-Id: I600ebe8bd0291a81f03efc33a7642bb2b0b7c9c4
2020-06-24 08:16:34 +00:00
Naseer Ahmed
fbcb5a89c9 Do not link mapper libraries statically
Linking them statically prevents the mapper SP HAL from being
extended

Bug: 158465474
Test: local build vts tools.
      Passed on VtsHalGraphicsComposerV2_XTargetTest.
Change-Id: I916b1c042b1e81e53f7398cd4a1a2231469ea91f
2020-06-24 07:10:58 +00:00
Midas Chien
8c79371377 Merge "composer: vts: send refresh frame even composition changes" into rvc-dev am: ac4ee96268
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/11631145

Change-Id: Ie92e8d7df9f0622c5f4fa23b0244ba433cc55e54
2020-06-02 16:57:19 +00:00
Midas Chien
2f5aec7024 composer: vts: send refresh frame even composition changes
sendRefreshFrame is used to send refresh frame to composer, so even
composition changes should present frame to composer.

Bug: 157638511
Test: VtsHalGraphicsComposerV2_4TargetTest on C2, R3
Change-Id: I325668b7a75cbbe72841c424eb9fc43479ac48b6
2020-05-28 22:53:01 +08:00
Midas Chien
5d177f9a0c Merge "composer: vts: send a frame after call setActiveConfig" into rvc-dev am: 6191c0abe2
Change-Id: I41f9359dd0e794424d05769b9204e5ba244a578f
2020-05-07 05:28:38 +00:00
Midas Chien
738702f875 composer: vts: send a frame after call setActiveConfig
setActiveConfig will take effect follow by a frame updated. To
make sure it takes effect, send a frame after setActiveConfig.

Bug: 150831726
Test: VtsHalGraphicsComposerV2_4TargetTest
Change-Id: Ib999e808ac1339d1cba9e25e9a57b681b055cc99
2020-05-01 00:42:57 +08:00
Dan Shi
aad51fa000 Rename vts-core to vts
Bug: 151896491
Test: local build
Exempt-From-Owner-Approval: This CL update suite name vts-core to vts as
the suite name is updated. This CL won't change test logic or behavior.

Change-Id: I562b4dc50765e953800a814a8fd84a01c1b9352b
Merged-In: I562b4dc50765e953800a814a8fd84a01c1b9352b
2020-04-07 16:37:40 -07:00
Steven Moreland
36f210147d graphics.composer@2.2 rc remove interface decls
Since vendors here add additional services to this service,
vts_ibase_test fails on some devices. This test, for sanity,
requires that if a service has any interface declaration, it has
all relevant interface declarations. These interface entries are
declared but unused here.

Fixes: 152375928
Test: vts_ibase_test on sargo
Change-Id: I2d3225b42824f0befb55d8c93a578e910a05e4a1
2020-04-03 15:58:29 +00:00
Ady Abraham
9c1d0adb3f composer: vts: check that refresh rate stays the same on inactivity
Bug: 147890947
Test: adb shell data/nativetest64/VtsHalGraphicsComposerV2_4TargetTest/VtsHalGraphicsComposerV2_4TargetTest
Change-Id: I9e1bc1325701ca1603251cc499712f11aa86d30e
2020-02-25 17:44:31 -08:00
Adam Bodnar
6c3929cc33 Explicitly destroy render engine in RenderEngineVts
The GLES driver appears to be left in a bad state without destroying the
render engine instance explicitly after every test case.

Bug: 149043811
Test: build, adb push out/target/product/<platform>/testcases/VtsHalGraphicsComposerV2_2TargetTest/<abi>/VtsHalGraphicsComposerV2_2TargetTest /data/local/tmp && adb shell /data/local/tmp/VtsHalGraphicsComposerV2_2TargetTest
Change-Id: I8e3c4e30eaa2ef3b9831da7b335b9a830be4b4ed
2020-02-18 13:34:27 -08:00
Ady Abraham
f6820b2b44 composer: add TestCommandReader to 2.4
Add a TestCommandReader to composer 2.4 VTS to parse correctly the
new commands introduced in 2.4.

Test: adb shell /data/nativetest64/VtsHalGraphicsComposerV2_4TargetTest/VtsHalGraphicsComposerV2_4TargetTest
Bug: 149124892
Change-Id: Ide4f98fa3bfc771e4095cc672f59b87e1aa03427
2020-02-10 11:24:04 -08:00
Dan Shi
b5fd31a128 Remove reference of VtsHalHidlTargetTestBase
All grahpics composer HAL tests have been converted to parameterized
gtest.

Bug: 147894326
Test: atest VtsHalGraphicsComposerV2_1TargetTest \
  VtsHalGraphicsComposerV2_2TargetTest \
  VtsHalGraphicsComposerV2_3TargetTest \
  VtsHalGraphicsComposerV2_4TargetTest

Change-Id: I84515a5698035d7ceb299a5cc140ecd7bb28fe84
2020-02-01 13:27:55 -08:00
TreeHugger Robot
a207171b50 Merge "Add generic layer metadata to Composer 2.4" 2020-01-23 15:35:44 +00:00
Vishnu Nair
4d3f559655 Merge "Change RenderEngine::drawLayers to take a vector of LayerSettings pointers" 2020-01-23 15:22:56 +00:00
Dan Stoza
a4bea0eac9 Add generic layer metadata to Composer 2.4
Bug: 139747351
Test: VtsHalGraphicsComposerV2_4TargetTest
Test: Manual verification with a modified Composer implementation
Change-Id: I800841ab1348a93c73c25c5f8bcf2254d9dc22e8
2020-01-22 13:16:09 -08:00
Peiyong Lin
015b7d98ff Merge "Add getClientTargetProperty API entry." 2020-01-18 01:08:18 +00:00
Vishnu Nair
02da997fab Change RenderEngine::drawLayers to take a vector of LayerSettings pointers
Prework for the client composition cache logic which extends
LayerSettings. Passing in a set of pointers will reduce the
amount of copying needed when passing the LayerSettings to
RenderEngine.

Bug: 136561771
Test: atest librenderengine_test libcompositionengine_test
Test: atest VtsHalGraphicsComposerV2_2TargetTest
Test: go/wm-smoke

Change-Id: I0581be7762bf56cd7a3aab0511adf95cd6e2df76
2020-01-18 00:55:51 +00:00
Peiyong Lin
bc51e08596 Add getClientTargetProperty API entry.
getClientTargetProperty will give hardware composer the ability to request some
properties of the client target that hardware composer wants. Prior to this
API, the client will does its best to produce the client target of which the
properties are pretty much fixed.

BUG: b/145968912
Test: mmma -j32 hardware/interfaces/graphics/composer/2.4/
Change-Id: I055f46b1eeba1d3e20d6a92a9d50a83e0f1ee694
2020-01-16 10:05:54 -08:00
Ady Abraham
5f9f9a45ae composer: vts: send a refresh command when required + test fix
When calling to setActiveConfigWithConstraints, the implementation may
need the client to send a refresh frame before the active config can be
changed. In addition, testing with a device with composer 2.4 revealed
few bugs which are fixed by this change.

Fix: 143775556
Test: adb shell data/nativetest64/VtsHalGraphicsComposerV2_4TargetTest/VtsHalGraphicsComposerV2_4TargetTest
Change-Id: Iafa1e85de60d99190d5d813f1d42924a62d94cc5
2020-01-13 14:26:49 -08:00
TreeHugger Robot
eea8c32428 Merge "[composer] Add createCommandWriter to command engine." 2020-01-11 01:25:29 +00:00
Ady Abraham
f81e0f7c05 Merge "composer: add seamlessPossible callback to composer 2.4" 2020-01-11 00:29:58 +00:00
Peiyong Lin
ad96dd9f12 [composer] Add createCommandWriter to command engine.
Command engine always uses V2.1 CommandWriterBase, change the creation of
command writer inside command engine so that we can use the right version of
command writer.

BUG: b/147365206
Test: build and boot.
Change-Id: I61fbbce19a44244725621e9a1cef750bd4c78b4d
2020-01-09 13:48:16 -08:00
Peiyong Lin
2be3570bc9 Make sure passthrough fails initialization if required interfaces can not be initialized.
All required interfaces must be able to initialized, make sure passthrough
fails if the requirement is not met.

BUG: b/147365206
Test: boot
Change-Id: I148655bc5392b1c0bc45f33ea3d2020824bb6f4b
2020-01-09 13:44:12 -08:00
Ady Abraham
30d818e8b3 composer: add seamlessPossible callback to composer 2.4
Add a callback to notify the client it should retry a
setActiveConfigWithConstraints call in case of SEAMLESS_NOT_POSSIBLE error.

Test: rev up composer to 2.4
Bug: 141329414
Change-Id: I6176638fde937e3916f58cc577d50cb755997c61
2020-01-08 17:19:08 -08:00
Peiyong Lin
96ee56bcd8 Remove beginCommand variants with a helper template.
BUG: b/147365206
Test: boot
Change-Id: I30715fe3e1c221ba366bf521fbd531636136f0c9
2020-01-08 14:55:20 -08:00
TreeHugger Robot
bd0827aa2f Merge "composer: register only vsync_2_4 callback" 2020-01-07 01:01:30 +00:00
TreeHugger Robot
9043f4e51b Merge "Add controls for ALLM and Content Types to composer hal" 2019-12-25 13:14:51 +00:00
TreeHugger Robot
d97b9ab2e2 Merge "composer 2.4: Add new test case for getDisplayCapabilities" 2019-12-23 11:38:00 +00:00
Yichi Chen
7337e0581b composer 2.4: Add new test case for getDisplayCapabilities
The original test case was only tested with bad display. The patch adds the
test case with normal displays.

Test: atest VtsHalGraphicsComposerV2_4TargetTest
Bug: 145566569
Change-Id: Id6a25ebc1f63092194ca1d8837cd450e5bc19def
2019-12-17 21:06:55 +08:00
Galia Peycheva
a0973458f5 Add controls for ALLM and Content Types to composer hal
Also extending the passthrough interface with setLowLatencyMode
and setContentType.

Bug:132731049

Test: make -j$(nproc)
Test: vts-tradefed run vts-hal --skip-device-info -m
VtsHalGraphicsComposerV2_4Target

Change-Id: I14dd61a3d9c60fdb06f9028ccd6f49797267e9f4
2019-12-17 13:50:58 +01:00
Robin Lee
8376bc7a10 Merge "Revert submission" 2019-12-14 03:06:24 +00:00
Hansong Zhang
517ac2ecae Revert submission
Based on Forrest run with earlier base build 6069142, the build with this submission failed apct/bluetooth/instrumentation_test 

Reason for revert: Break tests

Change-Id: I4f59a7e3d5c5f401a260f3c8ab3457cf4e2fe386
2019-12-13 22:03:10 +00:00
Galia Peycheva
54623045b9 Merge "Add controls for ALLM and Content Types to composer hal" 2019-12-13 10:09:00 +00:00
Automerger Merge Worker
dfb544e056 Merge "graphics: hwc2on1adapter: Buffer hotplug event after display creation" am: 74033a720b am: 076f84098e am: 43eedd211e
Change-Id: Ifa0eef52e8e439bddbbb2901008f3702d08f5c5c
2019-12-12 19:13:16 +00:00
Treehugger Robot
74033a720b Merge "graphics: hwc2on1adapter: Buffer hotplug event after display creation" 2019-12-12 18:28:05 +00:00
Galia Peycheva
2bd7d43325 Add controls for ALLM and Content Types to composer hal
Also extending the passthrough interface with setLowLatencyMode
and setContentType.

Bug:132731049

Test: make -j$(nproc)
Test: vts-tradefed run vts-hal --skip-device-info -m
VtsHalGraphicsComposerV2_4Target

Change-Id: I0ec5a5be796700074bdd8cac75cd67f96cd5df58
2019-12-10 11:43:06 +01:00