Commit graph

550 commits

Author SHA1 Message Date
Ady Abraham
3192f3dfdb Add Parcelable AidlComposer commands
Change the command interface to use parcelables instead of FMQ.

Bug: 201008710
Test: VTS
Change-Id: Iac67330eb34a5bcf253580e8109a67bd90483d85
2021-12-08 00:19:29 +00:00
Ram Indani
3944930291 Merge "Readback tests from VtsHalGraphicsComposerV2_2TargetTest VTS 2.2" 2021-12-06 21:13:12 +00:00
ramindani
b27f33b4b4 Readback tests from VtsHalGraphicsComposerV2_2TargetTest VTS 2.2
Tests are from https://source.corp.google.com/android/hardware/interfaces/graphics/composer/2.2/vts/functional/VtsHalGraphicsComposerV2_2TargetTest.cpp;l=431

Test: atest VtsHalGraphicsComposer3_TargetTest
BUG: 202766745
Change-Id: I591a7ecfc8bb6ec5e9d764e93a9d43f91b23ea74
2021-12-06 16:57:06 +00:00
Ady Abraham
4aa4ead85d composer: vts: fix display type
display is 64bit and not 32bit

Test: build
Bug: 202766745
Change-Id: I0e0d53222b306fe303867a105868e85e072c0299
2021-12-03 16:07:54 -08:00
ramindani
bab8ba921f Readback tests from VTS 2.2
Tests are from https://source.corp.google.com/android/hardware/interfaces/graphics/composer/2.2/vts/functional/VtsHalGraphicsComposerV2_2ReadbackTest.cpp;rcl=4796867049599ae1618d63cb93a38b269687164b;l=52

Test: atest VtsHalGraphicsComposer3_TargetTest
BUG: 202766745

Change-Id: I495819c168429873dc88decb20f398569c1a8128
2021-12-03 01:40:23 +00:00
ramindani
dcfe3a8b96 AIDL vts 2.1 command tests
Test: atest VtsHalGraphicsComposer3_TargetTest
BUG: 199413815
Change-Id: I4a49ae5e6110e45e96cd595e916a84d42470a93b
2021-12-02 17:07:12 +00:00
Ram Indani
8a2c44fa6c Merge "AIDL vts non reader writer 2.1 tests" 2021-12-02 16:48:55 +00:00
ramindani
2740baca70 AIDL vts non reader writer 2.1 tests
Test: atest VtsHalGraphicsComposer3_TargetTest
BUG: 199413815
Change-Id: Ib801b248c83111fafc2c239e1edecd859067c62e
2021-12-01 00:38:23 +00:00
ramindani
770d70876a AIDL vts 2.1 test differences in the existing tests.
Test: atest VtsHalGraphicsComposer3_TargetTest
BUG: 199413815
Change-Id: I4b3c6eadea9d17eabb9c06d098b654cd4d93267b
2021-11-30 21:50:01 +00:00
Alec Mouri
ece0bc399c Link in libshaders into composer VTS
Bug: 200309590
Test: builds
Change-Id: I71df8b0ea3b5df2ba09861bb3cd11645595f09bc
2021-11-24 12:23:48 -08:00
ramindani
a50a59e82d VTS 2.4 setActiveConfigWithConstraints_Delayed
and setActiveConfigWithConstraints_MissRefresh

Test: atest VtsHalGraphicsComposer3_TargetTest
BUG: 202053621
Change-Id: Ibdaa3377f7e30b466ffef8bd0c1cf09323800403
2021-11-22 17:21:14 +00:00
Ram Indani
8540a56f47 Merge "Tests SET_LAYER_PER_FRAME_METADATA and SetLayerColorTransform from VTS 2.3" 2021-11-22 16:52:04 +00:00
ramindani
7fec2c9316 Tests SET_LAYER_PER_FRAME_METADATA and SetLayerColorTransform from VTS 2.3
Test: atest VtsHalGraphicsComposer3_TargetTest
BUG: 202549950
Change-Id: Icceded3331dc59f50c8ce3234f7cfe12a76ff08a
2021-11-20 02:33:26 +00:00
ramindani
deb059e4c2 VtsHalGraphicsComposer3_TargetTest test fixes.
GraphicsComposerCallback Extend BnComposerCallback
 -> This will ensure that callback can be used for the binder.


Test: atest VtsHalGraphicsComposer3_TargetTest
BUG: 202053621

Change-Id: I739217cc40ede49601446306bd6ce0029a77cfba
2021-11-20 01:35:57 +00:00
ramindani
3335f7a4fe Migrate reader writer based tests for HAL 2.4
Test: atest VtsHalGraphicsComposer3_TargetTest, test are not run yet as we don't have the service yet.
BUG: 202446967
Change-Id: I5a9a807c8984cfc3db18440b6ee9ea2b43085324
2021-11-16 02:04:12 +00:00
Long Ling
abc390baae Merge "Fix comile error for pixel aidl hwc" 2021-11-12 04:39:26 +00:00
ramindani
c2b8d0879d Adds non reader/writer based HAL 2.2 tests for AIDL composer3
If service exists then we can proceed with test otherwise tests will be skipped.

Test: atest VtsHalGraphicsComposer3_TargetTest but tests don't just work yet. as we don't have service implementation.
BUG: 202053621
NOTE: Efforts to migrate reader/writer based tests will be done under b/202765481
Composition tests will be migrate under b/202766745

CHECK: https://googleplex-android-review.git.corp.google.com/c/platform/hardware/interfaces/+/16202961/4..6
GetClientTargetSupport_2_2 and GetClientTargetSupport_2_2BadDisplay are removed as per b/203093280

Change-Id: I7bea002072390b9e19bf9fe31de00087cf4d0bf3
2021-11-09 21:55:32 +00:00
TreeHugger Robot
d83f0e313d Merge "Link in libtonemap into composer VTS" 2021-11-09 17:55:04 +00:00
ramindani
592b651492 Adds non reader/writer based HAL 2.3 tests for AIDL composer3
If service exists then we can proceed with test otherwise tests will be skipped.

Test: atest VtsHalGraphicsComposer3_TargetTest but tests don't just work yet. as we don't have service implementation.
BUG: 202053621

CHECK: https://googleplex-android-review.git.corp.google.com/c/platform/hardware/interfaces/+/16019271/3..8

NOTE: Efforts to migrate reader/writer based tests will be done under b/202549950
Change-Id: I1a515a8ce53f4d314d517272a81a9a504a144eb2
2021-11-04 20:14:21 +00:00
Ram Indani
9aee712d79 Merge "Add invalid config const to the AIDL interface." 2021-11-04 18:44:23 +00:00
ramindani
0291f1111a Adds non reader/writer based HAL 2.4 tests for AIDL composer3
If service exists then we can proceed with test otherwise tests will be skipped.

Test: atest VtsHalGraphicsComposer3_TargetTest but tests don't just work yet. as we don't have service implementation.
BUG: 202053621

NOTE: Efforts to migrate reader/writer based tests will be done under b/202446967

CHECK: https://googleplex-android-review.git.corp.google.com/c/platform/hardware/interfaces/+/15987347/7..14

Change-Id: Ie7a81bbec463a471d9c88edf32cde6d86197991a
2021-11-04 16:47:33 +00:00
Ram Indani
6e822dfbef Add invalid config const to the AIDL interface.
Test: atest VtsHalGraphicsComposer3_TargetTest but tests don't just work yet. as we don't have service implementation.
BUG: 202053621
Change-Id: I96fc1f6bcb4ce4907342b3a73994f80b9347ea9f
2021-11-04 00:32:02 +00:00
ramindani
1cb794eb3d Populates the displays required for the tests.
Create composer callback for tests.

Test: atest VtsHalGraphicsComposer3_TargetTest, test are not run yet but
BUG: 202401906

Change-Id: I87396cdae7d083a2d2529617648fdd784e9097db
2021-11-01 23:40:48 +00:00
Alec Mouri
256264dc1f Link in libtonemap into composer VTS
Bug: 200310159
Test: builds
Change-Id: I9183cf2bcb11a837ab2f27d9210f3c30f02d093a
2021-10-29 14:39:00 -07:00
Ady Abraham
da95387a0a Merge changes I2b06ad79,I8b48188d
* changes:
  composer: add SKIP_VALIDATE to AIDL
  composer: remove getClientTargetSupport
2021-10-21 00:19:30 +00:00
Ady Abraham
2d43bb71b0 composer: dup handle before storing it
use dupToAidl to store handles in the command writer instead of
makeToAidl, to match the HIDL behaviour

Bug: 198190384
Test: build
Change-Id: Idb46de2182048d4fb3d6b598246c62e1969f629b
2021-10-20 23:04:08 +00:00
TreeHugger Robot
5a461fa66b Merge "composer: add CoGS team as OWNERS" 2021-10-20 22:15:06 +00:00
Treehugger Robot
af0806e4f5 Merge "Update OWNERS for VtsHalGraphicsComposer tests." am: cb0667c916 am: 83f6228bdf am: 2b799702ab am: d2eeeaabc2 am: 9d68d6be49
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1861820

Change-Id: Ica8fcb124b173ee79805d2d84352d6f1fea95880
2021-10-20 20:59:29 +00:00
Ady Abraham
b317b100e3 composer: add CoGS team as OWNERS
Change-Id: I861f2f9219bf82991efb0c2dc3db2073276012c0
2021-10-20 20:57:36 +00:00
Ady Abraham
6dde1bca6f Merge "Add command buffer support for AidlComposer" 2021-10-20 20:53:41 +00:00
Treehugger Robot
cb0667c916 Merge "Update OWNERS for VtsHalGraphicsComposer tests." 2021-10-20 19:28:03 +00:00
Ram Indani
941fbbb4e9 Merge "Fix the conditions for the tests based on comments on ag/15968818. Check EXPECT_TRUE with status ok and Error none for valid display. and EXPECT_FALSE with status ok. If service exists then we can proceed with test otherwise tests will be skipped." 2021-10-19 18:31:59 +00:00
Yiming Pan
cd9afdf0af Update OWNERS for VtsHalGraphicsComposer tests.
Test: Tree Hugger
Bug: 143903671
Change-Id: I228402a350ecccac92dea7c5facde60496ba3e6e
2021-10-18 17:28:00 -07:00
Ady Abraham
4e001df750 composer: add SKIP_VALIDATE to AIDL
HWC2_CAPABILITY_SKIP_VALIDATE was never defined for HIDL,
and instead there was a hack to just pass the value to the client
(see commit 6a05e9113a).

Test: build
Bug: 198690211
Change-Id: I2b06ad792237eb99e4dfe6b5c1ef808d5de45bd7
2021-10-18 16:45:23 -07:00
Ady Abraham
832258e931 composer: remove getClientTargetSupport
getClientTargetSupport is not used anyware

Bug: 203093280
Test: build
Change-Id: I8b48188d34c1b0c3eed02e1e5d94ff5be3413ae2
2021-10-18 16:45:20 -07:00
Ady Abraham
d06f050dca Add command buffer support for AidlComposer
Bug: 198190384
Test: build

Change-Id: Ia28cf992b0ab06099a9ea3f871925839e92e8dc9
2021-10-18 16:44:33 -07:00
Treehugger Robot
1a0a5129d3 Merge "Revert "VTS: Test that configs in a group differ only by vsync period"" am: b350c7cf49 am: 3741e92674 am: 58e3e65a63 am: 4e320b87f6 am: a50225b4a9
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1830034

Change-Id: I8db3a3c772cecde5143d521b864fb37551b8cce1
2021-10-18 22:53:20 +00:00
Treehugger Robot
b350c7cf49 Merge "Revert "VTS: Test that configs in a group differ only by vsync period"" 2021-10-18 21:39:37 +00:00
Treehugger Robot
184c1b546c Merge "Revert "Clarify the ComposerClient comment for CONFIG_GROUP"" 2021-10-18 20:56:12 +00:00
Snild Dolkow
0e9328e213 Revert "Clarify the ComposerClient comment for CONFIG_GROUP"
This reverts commit 37c5495c52.

This "clarification" was in fact a change of the HAL interface,
introducing a new requirement which was not present in earlier
Android releases. There are devices on the market that switch
seamlessly between configs that differ in resolution and DPI,
and therefore have those configs in a config group.

Bug: 200184776
Merged-In: I5bba1c6532f5f46da874385164a0bc0cc0435225
Change-Id: I5bba1c6532f5f46da874385164a0bc0cc0435225
2021-10-18 20:55:31 +00:00
Snild Dolkow
bf484a6adb Revert "VTS: Test that configs in a group differ only by vsync period"
This reverts commit 6f36dd6e31.

Differing only by vsync period was not a requirement on Android R, and
it shouldn't be added after-the-fact to an existing HAL version.

There are devices on the market that switch seamlessly between configs
that differ in resolution/dpi, and therefore have those configs in a
common group.

Bug: 200184776
Change-Id: Id0bfc67e55d5139fddb2b359cabafd9281c33734
2021-10-18 20:31:52 +00:00
TreeHugger Robot
6b371e2b41 Merge "Revert "Clarify the ComposerClient comment for CONFIG_GROUP"" 2021-10-18 20:29:10 +00:00
Alec Mouri
9f803e5a5b Merge "Add sdr white point information to composer3" 2021-10-16 04:36:04 +00:00
Snild Dolkow
5cd6212fee Revert "Clarify the ComposerClient comment for CONFIG_GROUP"
This reverts commit 37c5495c52.

This "clarification" was in fact a change of the HAL interface,
introducing a new requirement which was not present in earlier
Android releases. There are devices on the market that switch
seamlessly between configs that differ in resolution and DPI,
and therefore have those configs in a config group.

Bug: 200184776
Test: m
Change-Id: I5bba1c6532f5f46da874385164a0bc0cc0435225
2021-10-15 13:45:33 +02:00
ramindani
5f696940c9 Fix the conditions for the tests based on comments on ag/15968818.
Check EXPECT_TRUE with status ok and Error none for valid display. and EXPECT_FALSE with status ok.
If service exists then we can proceed with test otherwise tests will be skipped.

Test: atest VtsHalGraphicsComposer3_TargetTest but tests don't just work yet. as we don't have service implementation.
BUG: 202053621
Change-Id: Iff8f4ca1e102ad8333ca63b0722b1fbd26414d06
2021-10-14 19:04:43 +00:00
Long Ling
2997151fae Fix comile error for pixel aidl hwc
Bug: 201321174
Change-Id: Ib64dce591232e62985f72dffff22792fe908407a
2021-10-13 15:54:47 -07:00
Sally Qi
d515dbade2 Revert "Revert "Fix vts cases due to function change for async r..."
Revert^2 "Second Patch for async RenderEngine"

2109270e74a18585aceffc94d1758cee47bb4175

Bug: 202843200
Bug: 202833127
Bug: 202808760
Test: this
Change-Id: I504d2974d97e78431dc5d7e572e8ae70690dc34c
2021-10-13 11:15:13 -07:00
Alec Mouri
10bccc3c1f Add sdr white point information to composer3
* Add layer-level SDR white point. When there are mixed HDR/SDR layers
on the display, HDR layers should remain at display brightness, or
whatever the HDR standard is (e.g., keep HLG content at 1000 nits), while
SDR layers should be "dimmed" to the appropriate perceptual brightness.
* Add SDR white point to the client composited client target buffer.
When there are mixed HDR/SDR layers in client compostion, HWC must tell
SurfaceFlinger the target white point of the client target buffer so
that SurfaceFlinger-applied dimming may be atomically applied as a
brightness mode change.

Bug: 200310158
Test: builds

Change-Id: Ifbfe3125ede1a4de04978c6e644a5c911c33d3b6
2021-10-12 16:03:19 -07:00
Marin Shalamanov
051c72e1ff Merge "Update the Composer HAL docs for setContentType" 2021-10-11 09:48:20 +00:00
ramindani
a9780260ae Add two tests for Stable AIDL composer3 as a start of tests.
If service exists then we can proceed with test otherwise we skip tests

This should help us write all the tests until we have the service implementation.

Test: atest VtsHalGraphicsComposer3_TargetTest Tests don't just work yet, we don't have service implemented yet.
BUG: 202053621
Change-Id: Ia9506dada0f1b5da446d6e2086aa4534c60d5565
2021-10-07 16:33:24 +00:00