summaryrefslogtreecommitdiffstats
path: root/exynos4
diff options
context:
space:
mode:
Diffstat (limited to 'exynos4')
-rw-r--r--exynos4/hal/libgralloc_ump/alloc_device.cpp9
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