diff options
| author | Shilin Victor <chrono.monochrome@gmail.com> | 2019-03-05 21:50:51 +0300 |
|---|---|---|
| committer | Shilin Victor <chrono.monochrome@gmail.com> | 2019-03-05 21:50:51 +0300 |
| commit | c672ebf905154f0a5f85cd0bcfd067084fcc3b71 (patch) | |
| tree | 53d9d07bcb7ac73b5d543913b265318bea5b47e5 /exynos4 | |
| parent | 86d67b5c7ec1e2ea3d2df8c39ca5650c214abe97 (diff) | |
| download | hardware_samsung-c672ebf905154f0a5f85cd0bcfd067084fcc3b71.tar.gz hardware_samsung-c672ebf905154f0a5f85cd0bcfd067084fcc3b71.tar.bz2 hardware_samsung-c672ebf905154f0a5f85cd0bcfd067084fcc3b71.zip | |
Revert "exynos4: gralloc: actually disable ION allocations"
gralloc doesn't seem to play nice with LOS 16.0 when ION is fully disabled.
This reverts commit 4df1b84f0bf2cd4392c072453cf0a4a477d106d2.
Change-Id: I9c915ec9d24f9ca52fba744c6b68bea886b1c93d
Diffstat (limited to 'exynos4')
| -rw-r--r-- | exynos4/hal/libgralloc_ump/alloc_device.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/exynos4/hal/libgralloc_ump/alloc_device.cpp b/exynos4/hal/libgralloc_ump/alloc_device.cpp index adbc527..cd53376 100644 --- a/exynos4/hal/libgralloc_ump/alloc_device.cpp +++ b/exynos4/hal/libgralloc_ump/alloc_device.cpp @@ -296,18 +296,11 @@ static int gralloc_alloc_buffer(alloc_device_t* dev, size_t size, int usage, } ret = -1; -#if 0 - if (usage & (GRALLOC_USAGE_HW_COMPOSER | GRALLOC_USAGE_HW_ION)) { - ALOGV("%s: Allocating for HWC via ION...", __func__); - // the handle is guaranteed to have this usage flag set - // if it is going to be used as an HWC layer (see hwcomposer.h in hardware/libhardware) - ret = gralloc_alloc_ion(dev, size, usage, format, &ion_fd, &ion_paddr, &priv_alloc_flag, &ump_mem_handle); - } else if (usage & (GRALLOC_USAGE_HW_RENDER | GRALLOC_USAGE_HW_TEXTURE)) { + if (usage & (GRALLOC_USAGE_HW_RENDER | GRALLOC_USAGE_HW_TEXTURE)) { ALOGV("%s: Allocating graphicbuffer via ION...", __func__); priv_alloc_flag = priv_alloc_flag | private_handle_t::PRIV_FLAGS_GRAPHICBUFFER; ret = gralloc_alloc_ion(dev, size, usage, format, &ion_fd, &ion_paddr, &priv_alloc_flag, &ump_mem_handle); } -#endif if (ret < 0) { // may happen if ion carveout is out of memory, or if the |