summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-05-11Update to handle kernel 6.3.0 headers. am: a13b136e4atemp_275386652Christopher Ferris
Original change: https://android-review.googlesource.com/c/platform/hardware/google/graphics/common/+/2585166 Change-Id: I12919196103bec49f086a4ac99b81c9224f34983 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10Update to handle kernel 6.3.0 headers.Christopher Ferris
It looks like a couple of defines are incorrect. Change them to be the same as in the kernel. These defines are not actually used in the code yet, so this does not cause any changes in real code. Test: Builds. Change-Id: I33785b0ff0245a4ba47c16517a90ca31c8d9e984
2023-04-18Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994Xin Li
Bug: 275386652 Merged-In: I424bd4624ee7838fcdf6e40d20e0686c17c20de8 Change-Id: Ie7e990de7366a65e40750f2b8a060292c783d553
2023-03-14[automerger skipped] Merge Android 13 QPR2 am: 66fe0ec5c5 -s ours am: ↵Xin Li
ad1f98e6fe -s ours am skip reason: Merged-In I2317d9376802ca403ca0f46a11ae70aecef68e86 with SHA-1 707770395e is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/google/graphics/common/+/2487217 Change-Id: I821191532c5b924a7a8ed7e45f62953fe2067612 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14[automerger skipped] Merge Android 13 QPR2 am: 66fe0ec5c5 -s oursXin Li
am skip reason: Merged-In I2317d9376802ca403ca0f46a11ae70aecef68e86 with SHA-1 707770395e is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/google/graphics/common/+/2487217 Change-Id: I1c37e6f6b6eea19aae69deb67b0ef38337ad3214 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13Merge Android 13 QPR2android-u-beta-1-gplXin Li
Bug: 273316506 Merged-In: I2317d9376802ca403ca0f46a11ae70aecef68e86 Change-Id: I696977814bce03f5db22a47498aeb71831568c3c
2023-03-14libdevice: add bounds check when parsing HDR dynamic metadata am: 31ad515db6wenchangliu
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/common/+/21981248 Change-Id: Ic0bf13d6db002631bbf2e4e0a8c1a4c5d0b17342 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13libdevice: add bounds check when parsing HDR dynamic metadataandroid-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releasewenchangliu
Bug: 252764175 Test: run PoC on hwasan build Test: run cts -m CtsMediaDecoderTestCases -t android.media.decoder.cts.HDRDecoderTest Change-Id: I424bd4624ee7838fcdf6e40d20e0686c17c20de8
2023-02-23Merge "libhwc2.1: add dest info into checkSpecificRestriction" into ↵Midas Chien
tm-qpr-dev am: 6d24359dba Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/common/+/21439006 Change-Id: I297f0385a1157021c8af62796348f667814a31ca Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-23libhwc2.1: don’t skip 1st power on for the outer display am: 89cbf8568ajoenchen
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/common/+/21551787 Change-Id: I099e69ea7e5b27005cfccf0992ff2eb25e004ade Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-23Merge "libhwc2.1: add dest info into checkSpecificRestriction" into tm-qpr-devMidas Chien
2023-02-23libhwc2.1: don’t skip 1st power on for the outer displayjoenchen
The outer display turns off after bootloader. Therefore, the outer display’s first setPowerMode(on) is useful and cannot be skipped. Bug: 270520251 Test: try reboot after disabling smooth display Change-Id: I5ff5d4e04370169f45d24aa8b2c9a022549ea4ea
2023-02-22libhwc2.1: add dest info into checkSpecificRestrictionMidas Chien
checkSpecificRestriction() needs dest info to calculate vertical downscale ratio for new restriction. Bug: 266609442 Test: Dialer, Meet, Chrome, Camera, YT Change-Id: I65cf0e39c22d9dc2cb6578e9f76d22beb299968c
2023-02-17libhwc2.1: destroy DR thread immediately before power off am: b26ddd43ffWiwit Rifa'i
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/common/+/21457171 Change-Id: If39c8b64a85ad1685aae7e2c8746287fed7567b1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-17libhwc2.1: destroy DR thread immediately before power offWiwit Rifa'i
Dynamic recomposition worker thread needs to be destroyed before power off. However, usleep 5s in the worker thread would block the power off. So, we should wake up and destroy the worker thread immediately before power off. This will also fix uninitialized variables related to layer FPS calculation. Test: suspend-resume quickly Bug: 269554264 Change-Id: Id1873f5638c8c37a5e6342276f3977651f817bff
2023-02-13Merge "Remove spammy logs for power hint session" into tm-qpr-dev am: 79742cd65aTreeHugger Robot
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/common/+/21145911 Change-Id: I630faad2fde6b0566108e23526f3d0e5fa954a80 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-13Merge "Remove spammy logs for power hint session" into tm-qpr-devTreeHugger Robot
2023-02-13Merge "libhwc2.1: check specific restriction when fps switch to higher" into ↵Midas Chien
tm-qpr-dev am: f8948ac6f4 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/common/+/21162700 Change-Id: I49df67675ecd7277f594007e8756a3d9b775a811 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-13Merge "libhwc2.1: check specific restriction when fps switch to higher" into ↵Midas Chien
tm-qpr-dev
2023-02-13Merge "FBManager: limit max cached buffer size for g2d handle secure buffer" ↵Midas Chien
into tm-qpr-dev am: 27802f70d2 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/common/+/21224179 Change-Id: I33994621c5a50cdbd98f9500fbd22477ad03a265 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-13Merge "FBManager: limit max cached buffer size for g2d handle secure buffer" ↵Midas Chien
into tm-qpr-dev
2023-02-10libhwc2.1: enable dynamic recomposition based on sysprop am: a220daa306Wiwit Rifa'i
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/common/+/20869708 Change-Id: I74a3478b47b3712f4d04316e21b179f84355d140 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-10libhwc2.1: enable dynamic recomposition based on syspropWiwit Rifa'i
We can enable dynamic recomposition (DR) by default using sysprop "vendor.display.dynamic_recomposition". This prop should be an integer representing a bitmask of display indices that should enable DR, e.g: - 0 to disable DR for all displays - 1 to enable only for display with index 0 - 2 to enable only for display with index 1 - 3 to enable for displays with index 0 and index 1 We can also enable dynamic recomposition during runtime using ExynosHWCService: $ adb shell vndservice call Exynos.HWCService 11 i32 <display_id> \ i32 102 i32 <0:disable|1:enable> This will also change the update FPS threshold (condition for switching the mode to force CLIENT composition) from 5 Hz to 1/5 Hz. This will also fix layer FPS calculation so that it will not only be updated during setLayerBuffer but it will also be updated during the check in the dynamic recomposition thread. Bug: 267972056 Test: DR should be used when all layers have low fps Test: DR should not be used when there's front buffer or video layer Change-Id: I9c7259ad23d4b7eb23724ef284322ed9da488823
2023-02-06FBManager: limit max cached buffer size for g2d handle secure bufferMidas Chien
Secure buffer size is limited, we should release FBIds of secure buffer once they are finished. Limit max cached buffer size for g2d to handle secure buffer temporarily to avoid OOM. In future we should release it once G2D has released secure buffer. Bug: 261675967 Test: play secure video and switch composited between G2D and DEVICE Change-Id: I303f908599cb274228bc43516945b2a712f5d093 Merged-In: I303f908599cb274228bc43516945b2a712f5d093
2023-02-03libhwc2.1: check specific restriction when fps switch to higherMidas Chien
ag/18345164 introduced a restriction to prevent DPU handle 4k video in high refresh rate to avoid underrun. We need to check this restriction when switching refresh rate from low to high. Bug: 266850798 Test: play 4k video and switch refresh rate Change-Id: Icaab00149c26f7825ffc0fb0cd34e0b7badb160c
2023-02-02Merge "libhwc2.1: add display id for onRefresh" into tm-qpr-dev am: effac65ab3TreeHugger Robot
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/common/+/20605493 Change-Id: Idcb7038603ecc85c3809c4d01eb885352a2c712c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-02Merge "libhwc2.1: update resource manager/HWC service for multi displays" ↵TreeHugger Robot
into tm-qpr-dev am: eb31096ec7 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/common/+/20691318 Change-Id: Idc15de19e22275a7a4927d94a011a7ae85ebcf11 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-02Merge "libhwc2.1: add display id for onRefresh" into tm-qpr-devTreeHugger Robot
2023-02-02Merge "libhwc2.1: update resource manager/HWC service for multi displays" ↵TreeHugger Robot
into tm-qpr-dev
2023-01-31Remove spammy logs for power hint sessionMatt Buckley
Remove excessive logging in HWC due to an inactive power hint session. Bug: 262923207 Test: manual Change-Id: Ia1a3d9125d2fecac83d5a83049d415aac4c5907e
2023-01-31libhwc2.1: add display id for onRefreshlinpeter
Bug: 257422563 test: check on refresh call Change-Id: I00584237bf2b8b26c86a8964dc8a15b6324f74c5
2023-01-18Merge "hwc2.1 : CABC update switch condition" into tm-qpr-dev am: b8e0c8fb12Gil Liu
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/common/+/20500150 Change-Id: I468ec737bb16199ac3af9b7939bfac55c6228415 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-18Merge "hwc2.1 : CABC update switch condition" into tm-qpr-devGil Liu
2023-01-18Merge "libhwc2.1: allow to apply the first brightness" into tm-qpr-dev am: ↵TreeHugger Robot
07e37e08be Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/common/+/20475508 Change-Id: I2f87c59b2459b4760faca9f7155be7a2cafc36c7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-18Merge "libhwc2.1: allow to apply the first brightness" into tm-qpr-devTreeHugger Robot
2023-01-17libhwc2.1: avoid redundant wait while enabling LHBM am: 376a8b2db4Chris Lu
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/common/+/20919387 Change-Id: I029ac0cbd1a88cf590d3b8847b702b62e9288170 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-16libhwc2.1: avoid redundant wait while enabling LHBMChris Lu
We may have extra wait for the peak refresh while enabling LHBM if smooth display is disabled. Use condition wait instead of vblank so that we can continue enabling LHBM after receiving the peak notification. Bug: 263821118 Bug: 264719811 Test: capture trace Change-Id: Ie96aa21f1e0353578bb34c0655297700766ec5ed Merged-In: Ie96aa21f1e0353578bb34c0655297700766ec5ed
2023-01-13[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: ↵Xin Li
fb858a6df6 -s ours am skip reason: Merged-In I2317d9376802ca403ca0f46a11ae70aecef68e86 with SHA-1 707770395e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/common/+/20950609 Change-Id: I623f5fcd241d3e92be2035437447bacc3dc756dd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-12libhwc2.1: update resource manager/HWC service for multi displayslinpeter
Checked primary displays in preAssignWindows. Checked destination scale for all primary display in validateLayer. Added display id as input in setDDIScale. Bug: 257422563 test: check boot to home Change-Id: I18813fde26ac94c8dbb685aebdf38561bc4973ce
2023-01-11Merge tm-qpr-dev-plus-aosp-without-vendor@9467136temp_273316506_tm-qpr2Xin Li
Bug: 264720040 Merged-In: I2317d9376802ca403ca0f46a11ae70aecef68e86 Change-Id: I2b6b887ed97aa61b09cce6748d7d1f0f5d4f7ab2
2023-01-07Merge "Revert "libhwc2.1: keep vblank enabled for at least the next TE"" ↵TreeHugger Robot
into tm-qpr-dev am: 0c25f845ff Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/common/+/20877726 Change-Id: Ia7c12bd1ae779b8e6a81c7de59f74182a4ed66f1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-07Merge "Revert "libhwc2.1: keep vblank enabled for at least the next TE"" ↵TreeHugger Robot
into tm-qpr-dev
2023-01-06[automerger skipped] Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE am: ↵Bill Yi
dbe2bc2f13 -s ours am: ddb3c1e0f3 -s ours am skip reason: Merged-In I2f2ea1b229489b5aed597442c4a90295837f8204 with SHA-1 54483de1c9 is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/google/graphics/common/+/2377376 Change-Id: Ia7951cafba69f5b1a8ff916aa05118881d9a1205 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-06[automerger skipped] Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE am: ↵Bill Yi
dbe2bc2f13 -s ours am skip reason: Merged-In I2f2ea1b229489b5aed597442c4a90295837f8204 with SHA-1 54483de1c9 is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/google/graphics/common/+/2377376 Change-Id: I83fa364d27dd477e7a0e12ab31bb27f7f3710ded Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-06Merge TQ1A.230105.002 to aosp-master - DO NOT MERGEmain-16k-with-phonesBill Yi
Merged-In: I2f2ea1b229489b5aed597442c4a90295837f8204 Merged-In: Iae84a2b7fb67498a5e5b5a7c27660adb7cbe9398 Change-Id: Iaee691fcff9724c1f11653751a3689b6f094b7db
2023-01-06[automerger skipped] Merge TQ1A.230105.002 to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: 54483de1c9 -s ours am skip reason: Merged-In Iae84a2b7fb67498a5e5b5a7c27660adb7cbe9398 with SHA-1 faee7f1b41 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/common/+/20875282 Change-Id: I3e0a058698ef0970b949d19046e117f4c64b2da6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-05Revert "libhwc2.1: keep vblank enabled for at least the next TE"Chris Lu
This reverts commit 11b43f785af16507ef9583949631180a4d2e8d15. Reason for revert: LHBM cannot be enabled after booting Bug: 264161050 Test: enable LHBM after booting Change-Id: I2317d9376802ca403ca0f46a11ae70aecef68e86
2023-01-05libhwc2.1: allow to apply the first brightnesslinpeter
* allow to apply the first brightness * set the pending brightness before power off * clear brightness dirty flag only if power off Bug: 254657816 test: check brightness level after boot Change-Id: I6cf494fe004eb1a54bd81458ed0d4b0cc3e33978
2023-01-04Merge TQ1A.230105.002 to stage-aosp-master - DO NOT MERGEBill Yi
Merged-In: Iae84a2b7fb67498a5e5b5a7c27660adb7cbe9398 Change-Id: I2f2ea1b229489b5aed597442c4a90295837f8204
2022-12-26Merge "libhwc2.1: reset LHBM state while entering AOD mode" into tm-qpr-dev ↵TreeHugger Robot
am: 7c10792f83 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/common/+/20794267 Change-Id: Iae84a2b7fb67498a5e5b5a7c27660adb7cbe9398 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>