diff options
| author | Mathias Agopian <mathias@google.com> | 2010-08-24 10:24:52 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-24 10:24:52 -0700 |
| commit | 48f4d60622cc17afc9a1a41892434bf5347c930d (patch) | |
| tree | 07058b4f7d4b02f5a366ef9107c8a6cb23e93438 | |
| parent | 7f3d176705f796476a9b551762e7e96e82c45548 (diff) | |
| parent | ad20ef6be061091a95353fbf71712a3a97618304 (diff) | |
| download | msm7k-48f4d60622cc17afc9a1a41892434bf5347c930d.tar.gz | |
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
| -rw-r--r-- | libgralloc-qsd8k/gpu.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libgralloc-qsd8k/gpu.cpp b/libgralloc-qsd8k/gpu.cpp index c838cb6..d577f96 100644 --- a/libgralloc-qsd8k/gpu.cpp +++ b/libgralloc-qsd8k/gpu.cpp @@ -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; |