| commit | b4854a24d35a5e4c3f4da6aded4056572f9de1bb | [log] [tgz] |
|---|---|---|
| author | John Stultz <john.stultz@linaro.org> | Mon Mar 02 20:17:53 2020 +0000 |
| committer | John Stultz <john.stultz@linaro.org> | Mon Mar 02 21:07:48 2020 +0000 |
| tree | e5c7941ea4b7ea9f51fc4451d204de82764caa69 | |
| parent | 39931c49ec5f4dddb1b3363eca36978e1168cabf [diff] | |
| parent | ff730f9b4b9a251782dc6808ea32c1ecf3cdb459 [diff] |
Merge remote-tracking branch 'aosp/upstream-master' into HEAD This algins AOSP/master w/ the upstream gitlab master branch. This merge undoes some of the recent reverts on AOSP/master and instead takes the upstream fixes for those issues. * aosp/upstream-master: drm_hwcomposer: Relax failure when no EDID property is found drm_hwcomposer: Improve error messages. drm_hwcomposer: Add statistics on flattening to dump message drm_hwcomposer: Add fallback to client for layers flattening drm_hwcomposer: Add property that allows disabling of hardware scaling drm_hwcomposer: Try to fix build with older Android Pie releases drm_hwcomposer: Extract more BO data by Imagination importer v2 drm_hwcomposer: Revert "drm_hwcomposer: Extract more BO data by Imagination importer" Change-Id: I6c2ba4c2d8a4193952ee51faf3fcc1ad061a6d72 Signed-off-by: John Stultz <john.stultz@linaro.org>
Patches to drm_hwcomposer are very much welcome, we really want this to be the universal HW composer implementation for Android and similar platforms So please bring on porting patches, bugfixes, improvements for documentation and new features.
A short list of contribution guidelines:
Submit changes via gitlab merge requests on gitlab.freedesktop.org
drm_hwcomposer is Apache 2.0 Licensed and we require contributions to follow the developer's certificate of origin: http://developercertificate.org/
When submitting new code please follow the naming conventions documented in the generated documentation. Also please make full use of all the helpers and convenience macros provided by drm_hwcomposer. The below command can help you with formatting of your patches:
`git diff | clang-format-diff-5.0 -p 1 -style=file`
Hardware specific changes should be tested on relevant platforms before committing.
If you need inspiration, please checkout our TODO issues
Happy hacking!