aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-02-13Add metadataandroid-wear-p-preview-2android-p-preview-3android-p-preview-2android-p-preview-1android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7android-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7o-mr1-iot-preview-8o-mr1-iot-preview-7Bill Yi
Exempt-From-Owner-Approval: meta data BUG:67772237 Change-Id: I1251770a5a71442a9a258f88a0ab5852224d0544
2017-12-06DO NOT MERGE: Merge Oreo MR1 into masterandroid-wear-8.0.0_r1Xin Li
Exempt-From-Owner-Approval: Changes already landed internally Change-Id: Ifd8fe56c1b7ce565ab72c8f207ebe86c18da98ea
2017-11-21resolve merge conflicts of 03e4b92 to stage-aosp-masterChih-Hung Hsieh
Test: I solemnly swear I tested this conflict resolution. Change-Id: I72d53e4ed877dcd08504af65f24524acb9402ad8
2017-11-21Use -Werror in external/drm_hwcomposerandroid-o-mr1-iot-preview-6o-mr1-iot-preview-6Chih-Hung Hsieh
* Suppress non-critical warnings. Bug: 66996870 Test: build with WITH_TIDY=1 Exempt-From-Owner-Approval: Fix broken builds Change-Id: Icd412ef21c074ecea91eb91508703e42317a2b4b
2017-10-06Merge "drm_hwcomposer: make sure primary plane is allocated for squash" into ↵Adrian Salido
oc-mr1-dev am: 93be6aefeb Change-Id: I1b30d4e0665039d180913976f7545158298b9f7b
2017-10-06Merge "drm_hwcomposer: make sure primary plane is allocated for squash" into ↵oreo-mr1-devAdrian Salido
oc-mr1-dev
2017-10-02drm_hwcomposer: make sure primary plane is allocated for squashAdrian Salido
There are instances where the primary plane may have been disabled, look through disabled planes as well to find primary plane to use for squash. Change-Id: I615b4d94e852d21fa647ede6f2b53d55705d3011 Fixes: 66931966 Signed-off-by: Adrian Salido <salidoa@google.com>
2017-09-26drm_hwcomposer: reorder source layers according to zorderAdrian Salido
am: 8fc5634650 Change-Id: I505c9fe7f652146385299b2807d4cc1642f133d4
2017-09-21drm_hwcomposer: reorder source layers according to zorder am: 228ca6d118 am: ↵Adrian Salido
4b54b81847 am: 1ad48d0662 am: 2bd0f1d90e Change-Id: I4cae74eacdb01c8b65c70e9dc0c0041f3502f648
2017-09-21drm_hwcomposer: reorder source layers according to zorder am: 228ca6d118 am: ↵Adrian Salido
4b54b81847 am: 1ad48d0662 Change-Id: I377fb2ba4c75f12b74f7794c50c2d78c09aa082a
2017-09-21drm_hwcomposer: reorder source layers according to zorder am: 228ca6d118Adrian Salido
am: 4b54b81847 Change-Id: I5754e2f4cd28bc710ad32fb735b74af04b53bc10
2017-09-21drm_hwcomposer: reorder source layers according to zorderAdrian Salido
am: 228ca6d118 Change-Id: I5a87a1016525e0b0211c40f9c58cc7062431c893
2017-09-21drm_hwcomposer: reorder source layers according to zorderAdrian Salido
Precomp layers may be added to the back at different points which may cause elements to be unsorted. Make sure that these are sorted after provisioning planes to ensure right composition based on zorder. Bug: 65587393 Change-Id: Ica6d12093818341eaeca6c63735c558511679f7b Signed-off-by: Adrian Salido <salidoa@google.com>
2017-09-21drm_hwcomposer: reorder source layers according to zorderAdrian Salido
Precomp layers may be added to the back at different points which may cause elements to be unsorted. Make sure that these are sorted after provisioning planes to ensure right composition based on zorder. Bug: 65587393 Change-Id: Ica6d12093818341eaeca6c63735c558511679f7b Signed-off-by: Adrian Salido <salidoa@google.com>
2017-09-02drm_hwcomposer: enumerate additional formats for tegra downscale limitsAdrian Salido
am: d6ad94289e Change-Id: I222fcd0863dd3eb3fe8734fbfcc023319f939d1f
2017-09-01drm_hwcomposer: fix typo in formats switch statement am: 78beee0ecd am: ↵Adrian Salido
3eff025c2a am: a0bd156a4f am: cbe2d26cad Change-Id: Id03bb7080f744acc86c2da670406024e4100feed
2017-09-01drm_hwcomposer: fix typo in formats switch statement am: 78beee0ecd am: ↵Adrian Salido
3eff025c2a am: a0bd156a4f Change-Id: Ifa962ae3a6e4b72929b6d113d21e4cb9a93d064c
2017-09-01drm_hwcomposer: fix typo in formats switch statement am: 78beee0ecdAdrian Salido
am: 3eff025c2a Change-Id: Ied73e5887b7d9fdb3ebdfd6fddc98f619d243f2e
2017-09-01drm_hwcomposer: fix typo in formats switch statementandroid-o-mr1-preview-2android-o-mr1-preview-1Adrian Salido
am: 78beee0ecd Change-Id: I13a0894555d719e5d15b656c35918bc891f836db
2017-09-01drm_hwcomposer: enumerate additional formats for tegra downscale limitsAdrian Salido
There are additional formats that can be provided and are not handled. Bug: 36731060 Change-Id: I9f1356762df71e38402ad01f96a650adf2a3cbdc Signed-off-by: Adrian Salido <salidoa@google.com>
2017-09-01drm_hwcomposer: fix typo in formats switch statementAdrian Salido
Change-Id: I71e116fff098860a2aecf587298e7696d4bef012
2017-09-01drm_hwcomposer: enumerate additional formats for tegra downscale limits am: ↵Adrian Salido
a7e1ea5971 am: 4d2f0ec745 am: e37da9441b am: fb0071bb9f Change-Id: Id2c5e3aa69e8df42e37d446a59884df2cd202e9c
2017-09-01drm_hwcomposer: enumerate additional formats for tegra downscale limits am: ↵Adrian Salido
a7e1ea5971 am: 4d2f0ec745 am: e37da9441b Change-Id: I01be036f931279926d4dcba85ce76c442845b7c4
2017-09-01drm_hwcomposer: enumerate additional formats for tegra downscale limits am: ↵Adrian Salido
a7e1ea5971 am: 4d2f0ec745 Change-Id: I51a8d7d07b9dfbde7573dfd61d34154a5191dc3a
2017-09-01drm_hwcomposer: enumerate additional formats for tegra downscale limitsAdrian Salido
am: a7e1ea5971 Change-Id: I32aeff02404d2a91082fd8ee41d2a88256289f63
2017-08-29drm_hwcomposer: enumerate additional formats for tegra downscale limitsAdrian Salido
There are additional formats that can be provided and are not handled. Bug: 36731060 Change-Id: I9f1356762df71e38402ad01f96a650adf2a3cbdc Signed-off-by: Adrian Salido <salidoa@google.com>
2017-08-24drm_hwcomposer: skip layers with non-premult blendingAdrian Salido
am: a79125844f Change-Id: I342b9611c05a3bab51f81534466492e82937b3cf
2017-08-24drm_hwcomposer: skip layers with non-premult blendingAdrian Salido
Tegra driver assumes that all layers with alpha component have premult alpha. This can cause issues if blending is different since the alpha component is supposed to be ignored in that case. Fixes: 62401826 Test: share location in hangouts and drag around map Change-Id: Iff870697f7efbf5d075a5925d63a8f0f672ee725 Signed-off-by: Adrian Salido <salidoa@google.com>
2017-08-24drm_hwcomposer: skip layers with non-premult blending am: 329e7682c6 am: ↵Adrian Salido
56a3fe4fcd am: 5ecd39be96 am: cca0ee2b3f Change-Id: If6fad9f2871d53c0d7ffe7ec16b681a14b97d087
2017-08-24drm_hwcomposer: skip layers with non-premult blending am: 329e7682c6 am: ↵Adrian Salido
56a3fe4fcd am: 5ecd39be96 Change-Id: I0f65a6e3e2ea0ae669855095c686a6a4e3f0c3fa
2017-08-24drm_hwcomposer: skip layers with non-premult blending am: 329e7682c6Adrian Salido
am: 56a3fe4fcd Change-Id: I650fb374e2f580cbca83b05c99561d17185a7a39
2017-08-24drm_hwcomposer: skip layers with non-premult blendingAdrian Salido
am: 329e7682c6 Change-Id: Ic489da6c5fe07e9b0f670bb284c9d3a075bd20bd
2017-08-24drm_hwcomposer: skip layers with non-premult blendingAdrian Salido
Tegra driver assumes that all layers with alpha component have premult alpha. This can cause issues if blending is different since the alpha component is supposed to be ignored in that case. Fixes: 62401826 Test: share location in hangouts and drag around map Change-Id: Iff870697f7efbf5d075a5925d63a8f0f672ee725 Signed-off-by: Adrian Salido <salidoa@google.com>
2017-08-22DO NOT MERGE: revert HWC2 changesAdrian Salido
am: 9cc83934f9 Change-Id: I05491808727e9de5a066cda6887680c61838a932
2017-08-21DO NOT MERGE: revert HWC2 changesAdrian Salido
The changes are causing some issues with multi-window use cases. Fixes: 64491794 Test: test gmail compose in multi-window + show taps enabled Change-Id: I0b0a3f351ed48f81db89a71c78bf17bab8cb2acf Signed-off-by: Adrian Salido <salidoa@google.com>
2017-07-20Merge "drm_hwcomposer: add checks for tegra hardware limitation am: ↵Adrian Salido
19756b03f9 am: 48c27f347e" into oc-dr1-dev-plus-aosp am: fd9b20ac97 Change-Id: I88eee73481134c6ad9365948b897a225c20c15d7
2017-07-20Merge "drm_hwcomposer: add checks for tegra hardware limitation am: ↵Android Build Merger (Role)
19756b03f9 am: 5dbc0adc18 am: a4fa377c61" into oc-mr1-dev-plus-aosp
2017-07-20drm_hwcomposer: add checks for tegra hardware limitation am: 19756b03f9 am: ↵Adrian Salido
48c27f347e am: 2827209f78 Change-Id: Ic67d21f09f1429c6dc601fc42aa206e9b5c88cc1
2017-07-20drm_hwcomposer: add checks for tegra hardware limitation am: 19756b03f9 am: ↵Adrian Salido
5dbc0adc18 am: a4fa377c61 Change-Id: I2e58896970b9a70673288ff91b0e129c571ef9e6
2017-07-20Merge "drm_hwcomposer: add checks for tegra hardware limitation am: ↵Android Build Merger (Role)
19756b03f9 am: 48c27f347e" into oc-dr1-dev-plus-aosp
2017-07-20drm_hwcomposer: add checks for tegra hardware limitation am: 19756b03f9Adrian Salido
am: 48c27f347e Change-Id: Icedb82c895a3e436cf7133e4cbc6e411c016f13c
2017-07-20drm_hwcomposer: add checks for tegra hardware limitation am: 19756b03f9Adrian Salido
am: 5dbc0adc18 Change-Id: Ibd11e714718744372d4ed20e2ba7553af995b097
2017-07-20drm_hwcomposer: add checks for tegra hardware limitation am: 19756b03f9Adrian Salido
am: 48c27f347e Change-Id: I93aa89c0ae036b7644dc00fbdc33d5439e98b8ad
2017-07-20drm_hwcomposer: add checks for tegra hardware limitationAdrian Salido
am: 19756b03f9 Change-Id: I8b8c4a3c99ac3562fc79b22bf552048a537fef60
2017-07-20drm_hwcomposer: add checks for tegra hardware limitationoreo-dr1-devAdrian Salido
am: 19756b03f9 Change-Id: Icf3b3a761d8275c7a3527ff6efda1a124d27f4f8
2017-07-20drm_hwcomposer: add checks for tegra hardware limitationAdrian Salido
Current approach is to allow atomic_check figure out any issues with composition strategy and fallback to squash if there the atomic_check fails. This leads to issues when there's a protected content as it cannot be handled in squash. Adding a new provisioning stage to check for hardware limitations and address them early so a proper fall back can be in place. Bug: 36731060 Change-Id: I6482953044bcea9c9a655f28672927b32ac57097
2017-07-19drm_hwcomposer: add checks for tegra hardware limitation am: ee24aca7b8 am: ↵Adrian Salido
cbfc5a5d6b am: ae0502c648 am: 8fe20e590c am: ba9667c18a Change-Id: Ic480c24a50ddc96e89fafed00c2a563f4f470bab
2017-07-19drm_hwcomposer: add checks for tegra hardware limitation am: ee24aca7b8 am: ↵Adrian Salido
cbfc5a5d6b am: ae0502c648 am: 8fe20e590c Change-Id: I9b48a87d1cdc8e5ad7c228daabb66171d446118a
2017-07-19drm_hwcomposer: add checks for tegra hardware limitation am: ee24aca7b8 am: ↵Adrian Salido
cbfc5a5d6b am: ae0502c648 Change-Id: I20188c4e624cfa5094c7d12bcf212d85fdc307b5
2017-07-19drm_hwcomposer: add checks for tegra hardware limitation am: ee24aca7b8Adrian Salido
am: cbfc5a5d6b Change-Id: Ic2f1eb4ad4c2cd184ce27c2c40ed9193ca2d2795