am ad20ef6b: don\'t revert to ashmem if HW usage bits are set

Merge commit 'ad20ef6be061091a95353fbf71712a3a97618304'

* commit 'ad20ef6be061091a95353fbf71712a3a97618304':
  don't revert to ashmem if HW usage bits are set
This commit is contained in:
Mathias Agopian 2010-08-24 10:24:52 -07:00 committed by Android Git Automerger
commit b6eda20485

View File

@ -164,7 +164,7 @@ int gpu_context_t::gralloc_alloc_buffer(size_t size, int usage, buffer_handle_t*
// Allocate the buffer from pmem
err = pma->alloc_pmem_buffer(size, usage, &base, &offset, &fd);
if (err < 0) {
if (((usage & GRALLOC_USAGE_HW_2D) == 0) &&
if (((usage & GRALLOC_USAGE_HW_MASK) == 0) &&
((usage & GRALLOC_USAGE_PRIVATE_PMEM_ADSP) == 0)) {
// the caller didn't request PMEM, so we can try something else
flags &= ~private_handle_t::PRIV_FLAGS_USES_PMEM;