tree d0f622da1af6ee5508ca6f8afe657fb22c0ef68e
parent 7c2f3413d06bb04e0481cab22f946b7e1d375e5d
parent a88fbc333e9d7c9723edba45a19dd643d87d1c36
author Alistair Strachan <astrachan@google.com> 1531515021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1531515021 +0000

Merge changes from topic "gralloc-drm_hwc-prep"

* changes:
  hikey960: gralloc960: Tweak allocation so every HWC allocation doesn't come out of cma
  hikey960: gralloc960: Add support for building w/  drm_hwcomposer
  hikey960: gralloc960: Add usage field to map to older code
  hikey: gralloc: Allow use of CMA heap instead of fbdev
  hikey: gralloc: Add union alias and additional fields to improve interop w/ hikey960 gralloc
  hikey: gralloc: Change to allow gralloc_priv.h to be shared
  gralloc/gralloc960: Drop linux/ion.h references as its gone