summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-03-06Merge Android 14 QPR2 to AOSP mainHEADmastermainXin Li
Bug: 319669529 Merged-In: Icbe11cd026652e4490a2dcd2b8a377367142ade5 Change-Id: I1427588757ef6ca25a5f47f5ad62fb48ed7dc7bd
2024-01-17Merge Android 24Q1 Release (ab/11220357)temp_319669529Xin Li
Bug: 319669529 Merged-In: I00f6412ac3986aaa9663e585ee76fd599286c18c Change-Id: Icbe11cd026652e4490a2dcd2b8a377367142ade5
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: 90d6b0895e -s ours am: ↵Xin Li
8dc2ef449f -s ours am: 7f1bdf02a9 -s ours am skip reason: Merged-In Ib50ebc1d72bf309c0821170c20363a537d07f01a with SHA-1 b6d892dbcb is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/google/graphics/gs101/+/2863531 Change-Id: Id6d012d99592d80df1f0803ab2ae60fdb8bfa5d0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: 90d6b0895e -s ours am: ↵Xin Li
8dc2ef449f -s ours am skip reason: Merged-In Ib50ebc1d72bf309c0821170c20363a537d07f01a with SHA-1 b6d892dbcb is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/google/graphics/gs101/+/2863531 Change-Id: I65d68878465e5de756422e8a311657a436b93cd6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: 90d6b0895e -s oursXin Li
am skip reason: Merged-In Ib50ebc1d72bf309c0821170c20363a537d07f01a with SHA-1 b6d892dbcb is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/google/graphics/gs101/+/2863531 Change-Id: I9cb73ba49873d39d9a5e040cfc69b58a414a62ae Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08Merge Android 14 QPR1Xin Li
Merged-In: Ib50ebc1d72bf309c0821170c20363a537d07f01a Bug: 315507370 Change-Id: I80c84c1648c474e2756d4f6982fd31938ae4de23
2023-12-04libhwc2.1: Use getDcDisplayType instead of getDisplayTypeFromIndexSergey Volk
Currently HWC uses the getDisplayTypeFromIndex function in a number of places in common/gs101 code, but that function is defined only for primary displays. This CL introduces the getDcDisplayType function, which has the same behavior as getDisplayTypeFromIndex, but will also handle external display properly. Also replace getBuiltInDisplayType with getDcDisplayType too. Bug: 299682821 Test: presubmit Change-Id: I00f6412ac3986aaa9663e585ee76fd599286c18c
2023-12-02libhwc2.1: Use the new getPanelSysfsPath overloadSergey Volk
Bug: 288608645 Test: presubmit Change-Id: I60c53aab100992cbcec376f83d819dee9b8a7dea
2023-11-29histogram: avoid copying by passing a constant reference.John Chang
Bug: 301286479 Test: build completed successfully Change-Id: Iddd4755d971b871e667b7c3b34b8b2fb52b0ac82
2023-11-28libhwc2.1: Remove unused method getNumOfDppSergey Volk
Bug: none Test: presubmit Change-Id: I2b3b61f6b215e7999d38a420c5da85e7b7b6bc26
2023-11-20libhwc2.1: supply composer interface informationWeiChungChang
Bug: 310742462 Test: verify the accurate retrieval of composer interface information expected results. Change-Id: Iabe1b01b19e26e7ea9f0805a7b0e9b122adb6308
2023-11-06displaycolor: Skip init for external displaysSergey Volk
Recent change to enable displaycolor pipeline initialization for external displays has caused a memory-on-boot regression. This code path is not fully ready and not enabled yet anyway, so skip external display when initializing displaycolor for now. When we switch DisplayPort to use DECON1 for output, or when displaycolor implements a lazy pipeline init, we will re-enable this. Bug: 308255833 Bug: 288608645 Test: presubmit Change-Id: Ie1f0e48423c91d1b36a56799d6eb01b60a2e0709
2023-10-27libhwc2.1: initialize platform specific HistogramCapabilityLeo Chen
Bug: 299410182 Test: Build pass Change-Id: I5d6d3c2de2b770f640b82b1e34ad707bf27e1688 Signed-off-by: Leo Chen <yinchiuan@google.com>
2023-10-26displaycolor: Add init of color pipeline for external displaySergey Volk
When hardware composer initializes libdisplaycolor, it provides a list of displays, that currently includes only primary displays, but we want to support color management for external display too, so make sure the external display info is included into the display_info collection. Also there's no brightness controller for external display, so move the brightness_range initialization to the primary display path. Bug: 288608645 Test: build and boot a device Change-Id: Iac7a1b6e32367a7610aad25a0de0b5d488276031
2023-10-24libhwc2.1: skipping unnecessary stepsJohn Chang
Retrieve display interface only when required to optimize operations. BUG: 301286479 Test: Successfully build and check system works fine. Change-Id: Ie6e9e0a69b2fa956f829fcd282ac8efd7845b2f5
2023-10-24libhwc2.1: add missing pragma once for HistogramControllerLeo Chen
Bug: 299410182 Test: Build pass Change-Id: I4b72569e6d92c7163e990ee06929dd8e89528bce Signed-off-by: Leo Chen <yinchiuan@google.com>
2023-10-24libhwc2.1: Apply the clang-format for HistogramControllerLeo Chen
Bug: 299410182 Test: Build pass Change-Id: I3140e40313698eb806e46935b3bd87f25d2ca467 Signed-off-by: Leo Chen <yinchiuan@google.com>
2023-10-23Merge "Revert^2 "displaycolor: Add support for external displays"" into mainSergey Volk
2023-10-20Revert^2 "displaycolor: Add support for external displays"Sergey Volk
Revert submission 25099667-revert-25035359-hwc-displaycolor-ext-display-DHMMOMYHKN Reason for revert: The original CL was correct, just somehow landed in separate build from other CLs in the same topic. Reverted changes: /q/submissionid:25099667-revert-25035359-hwc-displaycolor-ext-display-DHMMOMYHKN Bug: 288608645 Bug: 306074705 Test: manual test on Pixel Fold, 6, 7, 8 Change-Id: I325554087bfcfcc99c54dd588f9a440f45035027
2023-10-19[automerger skipped] Merge 10952656 am: b6d892dbcb -s ours am: 628c4d3a29 -s ↵Xin Li
ours am skip reason: Merged-In Id36c3055e6cb0e2083a975455a549e05dbb80165 with SHA-1 fe4d155acd is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/gs101/+/25093203 Change-Id: I3375806986c046187705150553277a9dc02887ec Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19[automerger skipped] Merge 10952656 am: b6d892dbcb -s oursXin Li
am skip reason: Merged-In Id36c3055e6cb0e2083a975455a549e05dbb80165 with SHA-1 fe4d155acd is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/gs101/+/25093203 Change-Id: I8da8e6ea12eef2e1b9e49b740b5a3b03d0eced21 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-18Revert "displaycolor: Add support for external displays"Joe Shih
Revert submission 25035359-hwc-displaycolor-ext-display Reason for revert: DroidMonitor-triggered revert due to breakage b/306074705 Reverted changes: /q/submissionid:25035359-hwc-displaycolor-ext-display Change-Id: I0ae3662932baf6b9c8b9865420bcad6ee23e39fd
2023-10-17Merge 10952656tmp_amf_315507370Xin Li
Merged-In: Id36c3055e6cb0e2083a975455a549e05dbb80165 Change-Id: Ib50ebc1d72bf309c0821170c20363a537d07f01a
2023-10-12displaycolor: Add support for external displaysSergey Volk
Assign the correct display type in getDisplayInfo, according to mType and mIndex. Bug: 288608645 Test: manual test on Pixel Fold Change-Id: I0857abc32faaf1b5d368ad04d9f3c41827a744e7
2023-10-07[automerger skipped] Merge Android 14 am: 0de049b6fd -s ours am: 0c894b39ca ↵Xin Li
-s ours am: 6d7628a1aa -s ours am: acd5af8398 -s ours am: fe4d155acd -s ours am skip reason: Merged-In Idec78a8922beb4a5a4659c32f01086c929ac3eed with SHA-1 8acdce346b is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/google/graphics/gs101/+/2777034 Change-Id: Ie558ea70100f01b77ae61f3fe400709ef36b0ead Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 0de049b6fd -s ours am: 0c894b39ca ↵Xin Li
-s ours am: 6d7628a1aa -s ours am: acd5af8398 -s ours am skip reason: Merged-In Idec78a8922beb4a5a4659c32f01086c929ac3eed with SHA-1 8acdce346b is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/google/graphics/gs101/+/2777034 Change-Id: Id36c3055e6cb0e2083a975455a549e05dbb80165 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 0de049b6fd -s ours am: 0c894b39ca ↵Xin Li
-s ours am: 6d7628a1aa -s ours am skip reason: Merged-In Idec78a8922beb4a5a4659c32f01086c929ac3eed with SHA-1 8acdce346b is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/google/graphics/gs101/+/2777034 Change-Id: I2028fdcb4399a8b51d2ac757fa5daeede86677db Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 0de049b6fd -s ours am: 0c894b39ca ↵Xin Li
-s ours am skip reason: Merged-In Idec78a8922beb4a5a4659c32f01086c929ac3eed with SHA-1 8acdce346b is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/google/graphics/gs101/+/2777034 Change-Id: I66182431e3caeb5fe7670e13847beabbbd9438fb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 0de049b6fd -s oursXin Li
am skip reason: Merged-In Idec78a8922beb4a5a4659c32f01086c929ac3eed with SHA-1 8acdce346b is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/google/graphics/gs101/+/2777034 Change-Id: Ifdb1f38497e50f30fb7a2207a0d224229bb14448 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05Merge Android 14Xin Li
Bug: 298295554 Merged-In: Idec78a8922beb4a5a4659c32f01086c929ac3eed Change-Id: Iba5127a4251f83f2b3d376233155f8aeec1239ba
2023-10-03Don't depend on String8 cast to C string am: 8acdce346b am: c943f58653 am: ↵Tomasz Wasilczyk
cb3b13b334 am: 52dd0d81fb am: 87fb2ec3fa Original change: https://android-review.googlesource.com/c/platform/hardware/google/graphics/gs101/+/2749177 Change-Id: I300b9704badee07fc4a7487db7f9ac70f812ccc9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03Don't depend on String8 cast to C string am: 8acdce346b am: c943f58653 am: ↵Tomasz Wasilczyk
cb3b13b334 am: 52dd0d81fb Original change: https://android-review.googlesource.com/c/platform/hardware/google/graphics/gs101/+/2749177 Change-Id: I7cda1311c15f9e15770dd5f48c91ac51292fd715 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03Don't depend on String8 cast to C string am: 8acdce346b am: c943f58653 am: ↵Tomasz Wasilczyk
cb3b13b334 Original change: https://android-review.googlesource.com/c/platform/hardware/google/graphics/gs101/+/2749177 Change-Id: Iaed5e8757692e20e8cb7fcc2cc48e606f670f0b5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03Don't depend on String8 cast to C string am: 8acdce346b am: c943f58653Tomasz Wasilczyk
Original change: https://android-review.googlesource.com/c/platform/hardware/google/graphics/gs101/+/2749177 Change-Id: I597abfcd8310b1845a0ea0cbfbcb57c43159ef25 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-02Don't depend on String8 cast to C string am: 8acdce346btmp_amf_298295554Tomasz Wasilczyk
Original change: https://android-review.googlesource.com/c/platform/hardware/google/graphics/gs101/+/2749177 Change-Id: Ib75335f44d0353ca9a6ee2ae45a637cd78f0b0ec Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19clang-format: add IncludeBlocks Preserve & PointerAlignment Left am: ↵Wiwit Rifa'i
c58803102f am: 21fc95f941 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/gs101/+/24769282 Change-Id: I832a33d005cac16490a9b647f99dbe2bf9ce8849 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19clang-format: add IncludeBlocks Preserve & PointerAlignment Left am: c58803102fWiwit Rifa'i
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/gs101/+/24769282 Change-Id: I25c3b5e69b8c437a12ed1b41fcc453ef4b812ec9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-18clang-format: add IncludeBlocks Preserve & PointerAlignment LeftWiwit Rifa'i
We usually follow the same code style from framework/native. This will add some new rules that have been added to framework/native but not added here yet. Bug: 295892886 Test: git-clang-format Change-Id: I0cd0e2546f21452a08ee561f9b90224bd1a01a62
2023-09-18Merge "libhwc2.1: use unique point for brightness table" into mainTreehugger Robot
2023-09-18libhwc2.1: use unique point for brightness tablelinpeter
Bug: 281639941 Bug: 283378167 Bug: 299248160 test: brightness change properly Change-Id: I3c53265e5377b147781742c4fb6ac45b69cc5886
2023-09-13Merge "hwc: move updateBrightnessState into updateColorConversionInfo" into ↵Long Ling
udc-qpr-dev am: 87ad567b2d am: c00d94b83a Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/gs101/+/24670196 Change-Id: Iaf237f3d759669df251247388e68dd41200d3acb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12Merge "hwc: move updateBrightnessState into updateColorConversionInfo" into ↵Long Ling
udc-qpr-dev am: 87ad567b2d Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/gs101/+/24670196 Change-Id: Ia88e4340d22dce021b41824b9b137b592324936b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12Merge "hwc: move updateBrightnessState into updateColorConversionInfo" into ↵Long Ling
udc-qpr-dev
2023-09-12Don't depend on String8 cast to C stringTomasz Wasilczyk
Bug: 295394788 Test: m checkbuild Change-Id: Idec78a8922beb4a5a4659c32f01086c929ac3eed
2023-09-05hwc: move updateBrightnessState into updateColorConversionInfoLong Ling
Bug: 297294268 Change-Id: I22b1d9f13018d2af080e7bbf8f688373bdf9be14
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: 812edbfc7f -s ours ↵Xin Li
am: 7afac88ddd -s ours am: 0fcd4596b1 -s ours am: 125720c22e -s ours am skip reason: Merged-In I8e9ca263e387c96a9cb21474ef36d5ea0673dff5 with SHA-1 fdbde8e8a5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/gs101/+/24180959 Change-Id: I210ad893fdfb8d2238fd8386c38eb3a74bb47acf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: 812edbfc7f -s ours ↵Xin Li
am: 7afac88ddd -s ours am: 0fcd4596b1 -s ours am skip reason: Merged-In I8e9ca263e387c96a9cb21474ef36d5ea0673dff5 with SHA-1 fdbde8e8a5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/gs101/+/24180959 Change-Id: I426aa9aa913ff3a012a0f26eedacd08ca2f6e93c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: 812edbfc7f -s ours ↵Xin Li
am: 7afac88ddd -s ours am skip reason: Merged-In I8e9ca263e387c96a9cb21474ef36d5ea0673dff5 with SHA-1 fdbde8e8a5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/gs101/+/24180959 Change-Id: Ie36f73b4cc8906dd58a3795872950ec57f4d6b72 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28[automerger skipped] Merge Android U (ab/10368041) am: 812edbfc7f -s oursXin Li
am skip reason: Merged-In I8e9ca263e387c96a9cb21474ef36d5ea0673dff5 with SHA-1 fdbde8e8a5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/gs101/+/24180959 Change-Id: I037ba6632bdc96ff7de4d588998e44f524459823 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25Merge "libhwc2.1: Add HistogramController class" into udc-qpr-dev am: ↵Treehugger Robot
f3d0c5aaae am: 8831d29ce0 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/gs101/+/23667867 Change-Id: I990a71d5967a7ed7eae5cee8c18af7b7738a8ecf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-24 21:59:13 +0000