Commit graph

379 commits

Author SHA1 Message Date
Steven Moreland
62355801ca bufferqueue@1.0: remove comment in function def
Bug: 124382459
Test: manual
Change-Id: Ia99990d6ba3d50d81eb58735212142ec88a74293
2019-03-09 01:00:01 +00:00
Steven Moreland
a878aee9ab Update makefies: no 'types'
Bug: 123976090
Test: N/A
Change-Id: I30fb04c81889b62775e1b764b965fdb0f893de17
2019-03-04 11:27:17 -08:00
Peiyong Lin
849c980804 [composer] Remove implication.
The spec of setLayerDataspace never specifies the types of layer it should be
call on, however, the spec has the implication that this method will only work
for layers with buffer, which is mis-leading. This patch changes the wording of
setLayerDataspace spec, removes the implication. Note that this change won't
break backward compatability.

BUG: 126713799
Test: N/A
Change-Id: I97f22469897cb687dcb64a3d419bcb48a3668e5a
2019-02-28 17:00:30 -08:00
Dan Albert
a6a529236e Fix comparator operator() definition.
Comparators should be const. The libc++ update checks for this and
rejects non-const comparators.

Test: m
Bug: None
Change-Id: If2f76c020943b5bcb55803f0742990c9965afd6e
2019-01-11 14:48:55 -08:00
Marissa Wall
104ecb9e60 graphics: update owners
With olv@ no longer on the graphics team we need to update the
owners file to remove him and add new owners.

For composer the new owners are: lpy@ and vhau@
For allocator/mapper the new owner is: marissaw@

Test: N/A
Change-Id: Ied297e9446d480629155e1d9a96575ee518c2135
2019-01-10 14:27:55 -08:00
Chih-Hung Hsieh
65ab67312b Fix performance-for-range-copy warnings
Bug: 30413223
Test: make with WITH_TIDY=1 DEFAULT_GLOBAL_TIDY_CHECKS=-*,performance*
Change-Id: I1b76a22eab100a31e77048626e48169fe7eeaf92
2018-12-17 19:57:21 +00:00
Treehugger Robot
001a2cc09e Merge "HWC2OnFbAdapter: don't claim present fences work" 2018-12-12 20:35:03 +00:00
Chris Forbes
bdf93d0e68 HWC2OnFbAdapter: don't claim present fences work
We never produce real present fences, so indicate this to the
compositor. This will prevent GOOGLE_display_timing & friends from being
exposed in the client APIs.

Similar to previous change in HWC2On1Adapter.

Bug: b/111505197
Change-Id: I601a7f5628d4b218431fc0f1abb4807c9941ce64
(cherry picked from commit 3fac35a98a)
2018-12-11 18:31:06 -08:00
Keun Soo YIM
68ae05dd2d pack VTS cc_test binaries as general-tests
Test: make general-tests
Bug: 120093339
Merged-In: I363450d205868f900e4925ccff1430e2a569f2a4
Change-Id: I363450d205868f900e4925ccff1430e2a569f2a4
2018-12-07 10:49:56 -08:00
Bill Yi
5989a2f631 Merge pi-dr1-dev to aosp-master
Change-Id: Ida0bc98526f4fc7a1c20f5bbd3210b2f6156d459
2018-10-19 12:20:42 -07:00
Chia-I Wu
7d49f30d3e graphics: composer@2.2 does not require mapper@2.1
am: 0eafa742c6

Change-Id: I6f045113a3c0218a4b8f2c8e794892a21c1fc306
2018-10-19 11:48:36 -07:00
Chia-I Wu
0eafa742c6 graphics: composer@2.2 does not require mapper@2.1
Fix composer@2.2 VTS to not require mapper@2.1.  We will need a
better test infra before things get too complex.

Bug: 112248843
Test: manual
Change-Id: Ia71a102742fd26f14e8edf3f43f3351786350ccd
Merged-In: Ia71a102742fd26f14e8edf3f43f3351786350ccd
2018-10-18 11:22:09 -07:00
Peiyong Lin
8a7dc8e57b Merge "[Graphics] Only validate display in PresentOrValidateDisplay."
am: 0a0fa7209e

Change-Id: I174b127b17f6e9c2198da681f8272b26b110139d
2018-09-06 23:40:55 -07:00
Peiyong Lin
5b42b97ec5 [Graphics] Only validate display in PresentOrValidateDisplay.
Previously we require display to be validated in onRefresh, however, onRefresh
can be called while validateDisplay is executing, results in next
presentDisplay being skipped. This patch makes sure we don't check validation
state when presentDisplay is called.

BUG: 80063800
Test: build, flash, boot and play Youtube videos.
Change-Id: I3d8686db3274436afb6605812641768296f1af0e
Merged-In: I3d8686db3274436afb6605812641768296f1af0e
2018-08-29 14:45:15 -07:00
Steven Moreland
fb6a66b3f7 Merge "Update makefiles after native handle in Java."
am: 1847a2f2e7

Change-Id: I0f981009b2129436872e1e05a06c381c47701fdb
2018-08-14 15:53:31 -07:00
Steven Moreland
f5e4d7fb59 Update makefiles after native handle in Java.
Bug: 35098567
Test: N/A
Change-Id: I54b8d804e480cda09806f8028b966f28c4bd706e
2018-08-14 20:29:42 +00:00
Daniel Solomon
8c7038045a Revert "graphics: restart HWC when SurfaceFlinger stops"
am: a6f6fd7400

Change-Id: I5a241ea6ee77ee18b865ae150c7abe05c6a19061
2018-06-22 14:51:59 -07:00
Daniel Solomon
a6f6fd7400 Revert "graphics: restart HWC when SurfaceFlinger stops"
This reverts commit 399a5b8d60dd845b86c43cf4de55dda4d47384c6; this
change is no longer needed and is causing instability on some devices.

Bug: 74199279
Change-Id: Ia8ee7ae0958df029beac9eb1d343995c54fa8798
2018-06-22 17:57:45 +00:00
Carmen Jackson
db4740805a Merge "Add hwcomposer to the system-background cpuset for hal v2.2" into pi-dev
am: f053b3de23

Change-Id: Iab3ceb5c8d33786c851a162716fd9fffdc13f215
2018-06-19 17:14:17 -07:00
Carmen Jackson
76fa88e7a0 Add hwcomposer to the system-background cpuset for hal v2.2
This change was made for hal v2.1 but not cross-ported to 2.2.

Bug: 110167043
Test: $ adb shell ps -A | grep composer
system  630 ...  android.hardware.graphics.composer@2.2-service
$ adb shell cat /proc/630/cpuset
/system-background

Change-Id: I40b8a0386a7cf67fe64b1e0e40d81b78891faaca
2018-06-18 17:32:28 -07:00
huans
715a9092b0 Merge "SetColorMode is not available for vendor hwc less than 1.4" into pi-dev
am: 308d390720

Change-Id: I912853f863d6bf18c09f7385b099e2a7d0d7030b
2018-06-05 21:56:46 -07:00
TreeHugger Robot
308d390720 Merge "SetColorMode is not available for vendor hwc less than 1.4" into pi-dev 2018-06-06 04:48:34 +00:00
huans
f579ea47aa SetColorMode is not available for vendor hwc less than 1.4
Bug: 90510785
Test: VTS VtsHalGraphicsComposerV2_1Target SetColorMode(default) pass
Change-Id: Ia295b3ef2f0f433a7e1b5179eb230b8f7c649400
2018-06-01 14:33:30 -07:00
Chia-I Wu
479085d913 graphics: replace hidl_enum_iterator by hidl_enum_range
Change-Id: I012aa2bcbb81105ea1a1ec05a577f3bb8136b0da
Merged-In: I2180f18e8742850f728491887475f16b1cad4791
2018-05-31 08:40:24 -07:00
Chia-I Wu
dcb3ba075f Merge "graphics: COLORIMETRIC is optional for HDR modes" into pi-dev
am: 739c3177ea

Change-Id: Ida893aaf12b8750e5a96060c6edece486b4f9ad9
2018-05-30 17:09:13 -07:00
Chia-I Wu
8f5a17d1e8 graphics: COLORIMETRIC is optional for HDR modes
Bug: 80030364
Test: VTS
Change-Id: I2180f18e8742850f728491887475f16b1cad4791
Merged-In: I2180f18e8742850f728491887475f16b1cad4791
2018-05-30 11:52:57 -07:00
Chia-I Wu
d0d50652fb graphics: fix readback buffer tests
am: 09782444e3

Change-Id: I15b2eb478edcef44169005c51611e1fcb4210453
2018-05-23 13:25:57 -07:00
Chia-I Wu
09782444e3 graphics: fix readback buffer tests
Make readback buffer support optional.  Fix incorrect use of
setReadbackBuffer and getReadbackBufferFence.

Bug:  80030364
Test: VTS
Change-Id: I278a031c3c086ac38c460b7076a2952db57a91a4
Merged-In: I278a031c3c086ac38c460b7076a2952db57a91a4
2018-05-22 15:17:50 -07:00
Steven Moreland
cbc30e1f58 Merge "Update comments for doc comments." into pi-dev
am: cce4c95c1c

Change-Id: Id691cf973a214ee1d2f62297c13c8c030fc7a8bb
2018-05-18 18:43:45 -07:00
Steven Moreland
4ee4582230 Update comments for doc comments.
Doc comments look like "/** ... */" and they
can only be in certain places.

Bug: 79865343
Test: m
Change-Id: Ic15c08ff7dc6e4f9827c1dbe7f7236c11a572ec1
2018-05-18 10:10:32 -07:00
Dan Stoza
cdf9c58712 Merge "Composer 2.2: Fix readback docs" into pi-dev
am: 066288295e

Change-Id: I6721a52dbdb7141b84dde0516be6923b4016d7fa
2018-05-16 15:52:52 -07:00
Dan Stoza
e7bd22299a Composer 2.2: Fix readback docs
Fixes a couple of problems with the return codes in the readback
documentation and adds a paragraph of clarification about when
getReadbackBufferAttributes will be called.

Bug: 67048889
Test: N/A, doc fix only
Change-Id: Ic91b8db207c1b4b1f18777bd316279747506149b
2018-05-16 14:18:08 -07:00
Marissa Wall
4fc9c90b87 Merge "graphics: add new gralloc1 functions to passthrough" into pi-dev
am: c357006160

Change-Id: I082a978faf33039e7a962810cc1aefb4c86c3343
2018-05-03 15:58:09 -07:00
Marissa Wall
c357006160 Merge "graphics: add new gralloc1 functions to passthrough" into pi-dev 2018-05-03 22:45:45 +00:00
Marissa Wall
facec957e3 graphics: add new gralloc1 functions to passthrough
Add calls to the new gralloc1 functions: import, validateBufferSize
and getTransportSize. These new gralloc1 functions are used for
security hardening.

Bug: 66876469
Test: Manual
Change-Id: I18e485c48e1a24352208753144d936e1117d4ccb
2018-05-03 13:48:59 -07:00
android-build-prod (mdb)
7ba269ea79 Merge "HWC2On1Adapter: Fix fd leak in Layer::dump" am: 2e38b2c0f6
am: 28172ae62a

Change-Id: I384c44c57d05ca303fd04c9e920aae9e23c9ee45
2018-04-27 11:39:23 -07:00
Dan Stoza
9f20633e6c HWC2On1Adapter: Fix fd leak in Layer::dump
Removes the fence dump from Layer::dump, since:
  a) It was leaking (a dup() without a close())
  b) It's not that useful anyway since it wasn't displaying the actual
     fence fd

Test: Manual
Bug: 73979009
Change-Id: I8f7446a05a1bab8c3ca781610ebeb98d17fa483b
2018-04-26 12:52:35 -07:00
Chia-I Wu
6f869050d1 graphics: allow re-saturation for any legacy dataspace
am: c75e0f0bf9

Change-Id: Iced0f03f4a8e1ad3aa34b3c74a42b214865f5d19
2018-04-25 13:21:20 -07:00
Chia-I Wu
c75e0f0bf9 graphics: allow re-saturation for any legacy dataspace
While our intention is to only re-saturate legacy sRGB, the
re-saturation is usually performed globally by the composer.  To
avoid GPU fallback when, for example, video plays, allow the
re-saturation to be applied on any legacy dataspace.

This also removes the clamping after applying the re-saturation
matrix, allowing the output dataspace to be scRGB.

Bug: 78303195
Bug: 78025845
Test: manual
Change-Id: Ic221401894789fbaf6bad944b49006163238237c
2018-04-25 11:35:39 -07:00
Peiyong Lin
71641ca359 Merge "[Graphics] Update CommandWriter APIs to common::V1_1::* enum." into pi-dev
am: 584ee3b94a

Change-Id: Ieb29aadc2e9034a9ff76495755d290fc0432e781
2018-04-02 22:15:30 -07:00
Chia-I Wu
44a56de2c9 Merge "graphics: add RenderIntent and better HDR support" into pi-dev
am: aa6eca99e3

Change-Id: Ib3624e7188420ed9c538cd096627e93657001d90
2018-04-02 23:50:55 +00:00
Peiyong Lin
a2acfa2219 [Graphics] Update CommandWriter APIs to common::V1_1::* enum.
Previously we introduced Dataspace V1.1 and PixelFormat V1.1, thus APIs
accepting Dataspace should also be updated to accept V1_1::Dataspace and
V1_1::PixelFormat.

BUG: 77156734
Test: adb shell /data/nativetest/VtsHalGraphicsComposerV2_2TargetTest/VtsHalGraphicsComposerV2_2TargetTest
Change-Id: I00d00749f2895b727a18a28903256128a33e8b97
2018-04-02 15:56:45 -07:00
Chia-I Wu
6c8257feca graphics: add RenderIntent and better HDR support
This adds

  ColorMode::BT2020
  ColorMode::BT2100_PQ
  ColorMode::BT2100_HLG
  Dataspace::BT2020_HLG
  Dataspace::BT2020_ITU_HLG
  RenderIntent::COLORIMETRIC
  RenderIntent::ENHANCE
  RenderIntent::TONE_MAP_COLORIMETRIC
  RenderIntent::TONE_MAP_ENHANCE

and fixes per-frame metadata to be per-layer.  It also clarifies how
the composer should treat certain dataspaces and makes the
corresponding composer changes.

Bug: 73824924
Bug: 32148660
Test: manual
Change-Id: I5d12f50190522103c2ac97ee8dc2d5f6a2dabffe
2018-04-02 13:04:33 -07:00
Chia-I Wu
34dc4ddd4b graphics: add libhwc2on{1,fb}adapter
Moved from frameworks/native.

Test: build
Change-Id: I03bf1d073306aaa2ce155aee50fb9ac056906323
Merged-In: I03bf1d073306aaa2ce155aee50fb9ac056906323
2018-03-30 11:03:15 -07:00
Yuexi Ma
8ef11932b9 resolve merge conflicts of 07ff5f4376 to pi-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Id636c3171bffffeaf7a30a7912c38796e5a4c780
2018-03-26 16:05:07 -07:00
Yuexi Ma
07ff5f4376 Merge "Update vts test module bp files to use VtsHalTargetTestDefaults"
am: fa7f2bc917

Change-Id: Ie70c11daaf21a2a86732f26488ce92fdd764c3b7
2018-03-26 22:09:49 +00:00
Yuexi Ma
fa7f2bc917 Merge "Update vts test module bp files to use VtsHalTargetTestDefaults" 2018-03-26 21:57:41 +00:00
Lloyd Pique
8835aeae4b Merge "Fix crash on hotplug disconnect"
am: e4a97f23c2

Change-Id: Id4e07f31f399bfb6f236155435fbcfe6464c5b49
2018-03-24 01:22:58 +00:00
Lloyd Pique
56375fda7c Fix crash on hotplug disconnect
ComposerClient destroys its internal model of the display while handling
the onHotPlug event from the Hwc. Subsequently SurfaceFlinger destroys
its model of the display, and destroys all Hwc layers associated with
the display.

This fixes the code for destroying layers to not dereference an invalid
iterator if the display does not exist, allowing destruction to
continue.

It also fixes a similar issue which could occur if a HWC layer is being
created for a display at around the same time as the disconnect event.

Test: hotplug disconnect no longer crashes
Bug: 38464421
Change-Id: I0f2d28fe89fccf997b4bbb9fa6b5c0e6a6e49b93
Merged-In: I0f2d28fe89fccf997b4bbb9fa6b5c0e6a6e49b93
(cherry picked from commit 2765f9d406)
2018-03-23 22:30:46 +00:00
Yuexi Ma
d56539e62a Update vts test module bp files to use VtsHalTargetTestDefaults
Test: make vts
Change-Id: I3c0dab52dc894e1a1fc9b99be1351ed7bd380502
Merged-In: I3c0dab52dc894e1a1fc9b99be1351ed7bd380502
2018-03-22 23:36:10 +00:00