Merge remote-tracking branch 'aosp/upstream-master' into aosp-fdo-merge

Merge upstream freedesktop/master branch into aosp/master.

Upstream now supports required changes for HiKey/HiKey960 to
use drm_hwcomposer.

Change-Id: I50598105e38b01ea9411c5e7ba809396d7085e23
Signed-off-by: John Stultz <john.stultz@linaro.org>
tree: ed8f2e41547ac8e75be4c70e736d80c3e45e4a4b
  1. .clang-format
  2. .gitlab-ci.yml
  3. Android.mk
  4. MODULE_LICENSE_APACHE2
  5. NOTICE
  6. OWNERS
  7. README.md
  8. autofd.h
  9. autolock.cpp
  10. autolock.h
  11. drmconnector.cpp
  12. drmconnector.h
  13. drmcrtc.cpp
  14. drmcrtc.h
  15. drmdevice.cpp
  16. drmdevice.h
  17. drmdisplaycomposition.cpp
  18. drmdisplaycomposition.h
  19. drmdisplaycompositor.cpp
  20. drmdisplaycompositor.h
  21. drmencoder.cpp
  22. drmencoder.h
  23. drmeventlistener.cpp
  24. drmeventlistener.h
  25. drmframebuffer.h
  26. drmhwcgralloc.h
  27. drmhwcomposer.h
  28. drmhwctwo.cpp
  29. drmhwctwo.h
  30. drmmode.cpp
  31. drmmode.h
  32. drmplane.cpp
  33. drmplane.h
  34. drmproperty.cpp
  35. drmproperty.h
  36. hwcutils.cpp
  37. platform.cpp
  38. platform.h
  39. platformdrmgeneric.cpp
  40. platformdrmgeneric.h
  41. platformhisi.cpp
  42. platformhisi.h
  43. platformminigbm.cpp
  44. platformminigbm.h
  45. resourcemanager.cpp
  46. resourcemanager.h
  47. tests/
  48. vsyncworker.cpp
  49. vsyncworker.h
  50. worker.cpp
  51. worker.h
README.md

drm_hwcomposer

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-3.5 -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!