summaryrefslogtreecommitdiff
path: root/gralloc960
AgeCommit message (Collapse)Author
2022-01-04Merge "hikey: Use filegroup for drm_hwcomposer common files"android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Treehugger Robot
2021-12-20hikey: Use filegroup for drm_hwcomposer common filesRoman Stratiienko
In drm_hwcomposer the static library was replaced with filegroup to allow project-wide configuration using preprocessor definitions. Signed-off-by: Roman Stratiienko <r.stratiienko@gmail.com> Change-Id: Ic323433e3aac3980fc71fd2aee17335eb6746b37
2021-08-05hikey/hikey960: Clean up old build options for old kernelsJohn Stultz
We had a number of older build options to keep things working with older kernels, but with those kernels being unsupported with AOSP, we can go ahead and drop this logic to simplify things. Signed-off-by: John Stultz <john.stultz@linaro.org> Change-Id: Ibeaac890391fb21b33ebc45640053ab9db52ace9
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to device/linaro/hikeyandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-Apache-2.0 to: audio/Android.mk bluetooth/Android.bp hifi/debug-hifi/Android.mk libmemtrack/Android.mk mali/bifrost/Android.mk mali/utgard/Android.mk recovery/Android.bp Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD to: power/Android.mk Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD SPDX-license-identifier-GPL-2.0 SPDX-license-identifier-MIT legacy_unencumbered to: Android.bp Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-GPL-2.0 to: gralloc/Android.bp gralloc/Android.mk gralloc960/Android.bp gralloc960/Android.mk Added SPDX-license-identifier-GPL-2.0 to: wpan/uim/Android.mk Added SPDX-license-identifier-MIT to: hifi/xaf/host-apf/Android.bp hifi/xaf/host-apf/Android.mk Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I5414686a8063382cbec9a7d8b125c2a55c68c474
2020-09-22HiKey/HiKey960: Fix up new dmabuf_system_heap_device sepolicy falloutJohn Stultz
Hridya recently got some patches merged to add new default sepolicy for the dmabuf_system_heap_device (/dev/dma_heap/system). However, since HiKey960 already had its own policy for /dev/dma_heap/system, this causes conflicts which break gralloc as well as future system use of the dmabuf heaps. So refactor the policy to avoid relabeling the system heap, or labeling the /dev/dma_heap/ directory. Also add permissions for gralloc to access the new dmabuf_system_heap_device, and take care to open the dmabuf heaps as READONLY, as RW isn't necessary and the policy limits to RO. Signed-off-by: John Stultz <john.stultz@linaro.org> Change-Id: I574f9231f1d04f3b36b4f75145f2e698b9009508
2019-12-16gralloc960: Extend gralloc to use dmabuf heapsJohn Stultz
Extends the HiKey960 gralloc implementation to use the dmabuf heaps interface (v16+Andrew's renames). Signed-off-by: John Stultz <john.stultz@linaro.org> Change-Id: I1c0be5f81a56da9c675535c107f82e79c77754e0
2019-12-16gralloc960: Clean up previous ion api reworkJohn Stultz
Some of the work done for the ION 4.12+ ABI change could be done in a cleaner fashion. This tries to consolidate the logic so we have less conditional switching depending on if we're using legacy code or not, and also utilizes ion_alloc_fd() to simplify the older ion_alloc usage. Change-Id: I0891814663eaf26c7a9625331c2fc2db93700d0f Signed-off-by: John Stultz <john.stultz@linaro.org>
2019-04-25Modify gralloc0 implementationValerie Hau
Add validateBufferSize and getTransportSize Bug: 131089111 Test: build, boot Change-Id: I1eb01fe01af5b0f6b6d3dbccd522eb73bd436053
2019-03-29Move hwcomposer.drm_hikey and hwcomposer.drm_hikey960android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5Colin Cross
Prevent external/drm_hwcomposer from referencing device/linaro/hikey, which may not exist in all trees, by compiling most of drm_hwcomposer as a static library and then compiling just the source files that are affected by device-specific #defines and #includes in device/linary/hikey/gralloc*. Fixes: 129543119 Test: m hwcomposer.drm_hikey hwcomposer.drm_hikey960 MODULES-IN-external-drm_hwcomposer Change-Id: Idaac809ba271b27998f89c877ede46def9a417a4
2018-07-11hikey960: gralloc960: Tweak allocation so every HWC allocation doesn't come ↵John Stultz
out of cma Since we only need CMA for the HW_FB, don't use CMA for every buffer, as otherwise we fragment and run out of CMA space fairly quickly. Change-Id: I3f274fa4ac4a47e80f2cb350675c197222a92a88 Signed-off-by: John Stultz <john.stultz@linaro.org>
2018-07-11hikey960: gralloc960: Add support for building w/ drm_hwcomposerJohn Stultz
If we're building with drm_hwcomposer, we need to set the following gralloc960 flags: ION_DMA_HEAP=1 DISABLE_FRAMEBUFFER_HAL=1 Change-Id: I832993b0ade105c3f72c81a28de2b8c336d283e2 Signed-off-by: John Stultz <john.stultz@linaro.org>
2018-07-11hikey960: gralloc960: Add usage field to map to older codeJohn Stultz
The r9p0 gralloc changed the names of usage field, so add a compatibility union so it will work with the platformhisi buffer importer in drm_hwcomposer Change-Id: I75d6df4a81916a5cdf51cfed3750c7dceeedc03e Signed-off-by: John Stultz <john.stultz@linaro.org>
2018-07-11gralloc/gralloc960: Drop linux/ion.h references as its goneJohn Stultz
Bionic dropped the linux/ion.h header, so make sure we don't try to include it and cause build errors. Change-Id: I6af15f1bd2b53e7d5dd29a93295bfc09df36ab62 Signed-off-by: John Stultz <john.stultz@linaro.org>
2018-06-20hikey960: gralloc960: Fix log.h include to avoid warningsJohn Stultz
Change-Id: Ie1b1ab49285c5253b6680fd5b91ee01a4bb1bde0 Signed-off-by: John Stultz <john.stultz@linaro.org>
2018-04-12gralloc960: Avoid warnings about cutils/log.hJohn Stultz
In building for treble I started noticing deprecation warnings on cutils/log.h. So switch to log/log.h. Change-Id: Id08ebd0adb00b3ae50875776883fa4104ebb2992 Signed-off-by: John Stultz <john.stultz@linaro.org>
2018-04-11Stop including version_defaults.mkColin Cross
version_defaults.mk is part of the core build system, and not intended for including by modules. It is guaranteed to have already been included before any Android.mk files have been read. Including it twice causes HAS_BUILD_NUMBER to be set to true which causes incremental rebuilds to reread all the makefiles: $(file <out/build_number.txt) was changed, regenerating... Also fix the unnecessary $(info) messages that clutter the build output. Test: m nothing && m nothing Change-Id: I9476642c65c6223af99761fdb8c89fb0b53198c7
2018-03-29gralloc960: Re-implement ION v4.12+ ABI support for r9p0 gralloc codeJohn Stultz
Reimplements Sumit's changes to support the new ION interface ontop of the ARM r9p0 reference gralloc implementation. Change-Id: Ib699658f68bec84767ff1045f75e457d39b68e7c Signed-off-by: John Stultz <john.stultz@linaro.org>
2018-03-29gralloc960: Update to the r9p0 gralloc releaseJohn Stultz
This is necessary in order to support r9p0 libGLES_mali.so binaries. NOTE: This unfortunately drops recent changes like v4.12+ ION abi compatibility, which will need to be re-implemented and re-added. NOTE: This change requires both kernel changes for the r9p0 driver as well as binariy r9p0 libGLES_mali.so libraries. Don't merge until those are all lined up to land. Change-Id: I6c7fdf7585edea08196d1a323db3ec0629883311 Signed-off-by: John Stultz <john.stultz@linaro.org>
2018-03-09Remove software flex pixel formatsChia-I Wu
gralloc is not expected to see them (yet). Bug: 70526789 Test: none Merged-In: If5b0635e54f380950abcbe6f814932992ae49bec Change-Id: If5b0635e54f380950abcbe6f814932992ae49bec
2018-01-22Include what we use.Dan Albert
Test: mma Bug: None Change-Id: I704787703c2fde533bda066e7c49d9f0c6bd2f26 Exempt-From-Owner-Approval: Janitorial
2018-01-19gralloc960: Remove explicit check for TARGET_PRODUCT == hikey960Dmitry Shmidt
hikey960 build and its derivatives will install only gralloc.hikey960 Bug: 72216718 Test: Manual Change-Id: Ie82e5cb9e51824ecb0af5bfdc72bf75eae0ed766 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2017-12-08hikey: gralloc960 Update for new ION interfaceSumit Semwal
4.12+ kernels have an updated ION interface; this adapts hikey's gralloc to work seemlessly with both old and new kernels' interfaces. Currently supports only system heaps. Change-Id: Ice26d05f65bb4dfcc5ce2ae3bbcbbab4e9a3723a Signed-off-by: Sumit Semwal <sumit.semwal@linaro.org> [jstultz: Build fixes] Signed-off-by: John Stultz <john.stultz@linaro.org>
2017-12-08gralloc960: Workaround: copy ion_4.12.h from libionSumit Semwal
libion adds a temporary header for 4.12 headers with new ION ABI interface. Since it's internal to libion being temporary, for now, copy it here. This will need to be removed once header situation in libion is sorted. Test: tested with both new and old kernels. Change-Id: I5a454713590fd18a52d9661d4a3bac81e62e7c25 Signed-off-by: Sumit Semwal <sumit.semwal@linaro.org> Signed-off-by: John Stultz <john.stultz@linaro.org>
2017-07-14gralloc960: make register framebuffer no-opandroid-o-preview-4Chia-I Wu
Bug: 62222821 Test: boots Change-Id: I61ae68b3772b22e174aa8a0f7114ecf5f3a2dc14
2017-07-14gralloc960: do not use private_handle_t::{ion_hnd,pid}Chia-I Wu
This makes private_handle_t native_handle_clone friendly. Bug: 62222821 Test: boots Change-Id: I658a0448efd61a4ce8ec60b1e10e582bb5678c0e
2017-07-14gralloc960: make fbdev fd a shallow copyChia-I Wu
We never free private_module_t::framebuffer once it is initialized. We can use a shallow copy of the fbdev fd. Bug: 62222821 Test: boots Change-Id: Id35641fa183993ce36a3c0ec7b7f4121bfdf36c4
2017-05-30HiKey960: Properly integrate mali bifrost gralloc for HiKey960John Stultz
This properly integrates the mali bifrost gralloc implementation for HiKey960. This change depends on a pristine libGLES_mali.so which needs an updated arm vendor package. However, after this change, the hisi vendor package is no longer necessary. Change-Id: I7a01911a911525ba6f2dae6cfb0adc1d22412c06 Signed-off-by: John Stultz <john.stultz@linaro.org>
2017-05-26HiKey960: Integrate ARM's reference gralloc for mali bifrostJohn Stultz
This integrates the BX304L01B-SW-99005-r4p0-01rel0 mali bifrost package from ARM available here: https://developer.arm.com/products/software/mali-drivers/android-gralloc-module Change-Id: I737bce784d21d1a870229a16bcddd3668738405a Signed-off-by: John Stultz <john.stultz@linaro.org>