summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Dodd <atd7@cornell.edu>2012-12-08 12:27:01 -0500
committerAndrew Dodd <atd7@cornell.edu>2012-12-08 18:22:52 -0500
commit19e59a77d90d963d8a2b3e91daefe59fdeebe3e0 (patch)
tree4b6113c736830b39b3e40bfdeb2aadc2bd1fc9a0
parent6aab55a059d81151596ac2feff8ee5192aa55930 (diff)
downloadhardware_samsung-19e59a77d90d963d8a2b3e91daefe59fdeebe3e0.zip
hardware_samsung-19e59a77d90d963d8a2b3e91daefe59fdeebe3e0.tar.gz
hardware_samsung-19e59a77d90d963d8a2b3e91daefe59fdeebe3e0.tar.bz2
gralloc: Back out hacks now that Mali-derping is fixed
Two reverts squashed, due to Mali-derping being fixed in frameworks/native: Revert "gralloc: avoid using framebuffer" This reverts commit 5125ccc5b6d9a4bf1256a4a57f6d5f7d0ebe26c9. Revert "gralloc: Send first 2 FB buffers to carveout and next to UMP" This reverts commit d288deb284f205c6b0eae04b27377c902afaf24e. Change-Id: I530dc255b7543e03d0e8277d3ad12ed11d6649ab
-rw-r--r--exynos4/hal/libgralloc_ump/alloc_device.cpp13
1 files changed, 1 insertions, 12 deletions
diff --git a/exynos4/hal/libgralloc_ump/alloc_device.cpp b/exynos4/hal/libgralloc_ump/alloc_device.cpp
index 65eb717..f2befdd 100644
--- a/exynos4/hal/libgralloc_ump/alloc_device.cpp
+++ b/exynos4/hal/libgralloc_ump/alloc_device.cpp
@@ -445,21 +445,10 @@ static int alloc_device_alloc(alloc_device_t* dev, int w, int h, int format,
}
int err;
- private_module_t* m = reinterpret_cast<private_module_t*>(dev->common.module);
- const uint32_t bufferMask = m->bufferMask;
- const uint32_t numBuffers = m->numBuffers;
pthread_mutex_lock(&l_surface);
-
- // Remove the hardware framebuffer flag to avoid lags
- usage = usage & ~GRALLOC_USAGE_HW_FB;
-
-/*
- * Using the framebuffer causes lags, so don't use it at all ;-)
- *
- if (usage & GRALLOC_USAGE_HW_FB && (bufferMask < ((1LU << numBuffers) - 1)))
+ if (usage & GRALLOC_USAGE_HW_FB)
err = gralloc_alloc_framebuffer(dev, size, usage, pHandle, w, h, format, 32);
else
-*/
err = gralloc_alloc_buffer(dev, size, usage, pHandle, w, h, format, 0, (int)stride_raw, (int)stride);
pthread_mutex_unlock(&l_surface);