summaryrefslogtreecommitdiffstats
path: root/exynos4
diff options
context:
space:
mode:
authorShilin Victor <chrono.monochrome@gmail.com>2019-02-24 01:26:18 +0300
committerShilin Victor <chrono.monochrome@gmail.com>2019-02-24 01:26:18 +0300
commitbb91a6029facbb74dfa4bba58bb18461c22734ea (patch)
tree6c9ce31ca097b22c0bcd2bd1317968e7285d3178 /exynos4
parent4c999c3fa70a1577db92e6832e4e69d3ed1c14df (diff)
downloadhardware_samsung-bb91a6029facbb74dfa4bba58bb18461c22734ea.tar.gz
hardware_samsung-bb91a6029facbb74dfa4bba58bb18461c22734ea.tar.bz2
hardware_samsung-bb91a6029facbb74dfa4bba58bb18461c22734ea.zip
Revert "gralloc: switch to UMP-only allocations"
This reverts commit 33b21658f39d7338cef9cbeda30645b3e3ff0b36. Change-Id: I17953c198b97404df00a285c053d5713e9fe022f
Diffstat (limited to 'exynos4')
-rw-r--r--exynos4/hal/libgralloc_ump/alloc_device.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/exynos4/hal/libgralloc_ump/alloc_device.cpp b/exynos4/hal/libgralloc_ump/alloc_device.cpp
index adbc527..7a4c672 100644
--- a/exynos4/hal/libgralloc_ump/alloc_device.cpp
+++ b/exynos4/hal/libgralloc_ump/alloc_device.cpp
@@ -296,7 +296,6 @@ 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
@@ -307,7 +306,6 @@ static int gralloc_alloc_buffer(alloc_device_t* dev, size_t size, int usage,
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