diff options
| author | Alexander Koskovich <akoskovich@pm.me> | 2022-09-21 17:02:37 -0700 |
|---|---|---|
| committer | Alexander Koskovich <akoskovich@pm.me> | 2022-09-21 17:02:37 -0700 |
| commit | 1ef5b560b7913069083723bc16dbb732104c61b5 (patch) | |
| tree | fabbaf89051348c6d0a4509281bb43de3a1843f8 | |
| parent | 2b9bf01079a10b62e9163273b89312016ce52e9f (diff) | |
Revert "gralloc: Enable libvmmem for secure allocation"
This reverts commit 903f9983413e3fda90751778469d6b9054b8adf2.
| -rw-r--r-- | gralloc/Android.bp | 1 | ||||
| -rw-r--r-- | gralloc/gr_dma_mgr.cpp | 14 | ||||
| -rw-r--r-- | gralloc/gr_dma_mgr.h | 1 |
3 files changed, 4 insertions, 12 deletions
diff --git a/gralloc/Android.bp b/gralloc/Android.bp index 95b2af44..f6d18714 100644 --- a/gralloc/Android.bp +++ b/gralloc/Android.bp @@ -64,7 +64,6 @@ cc_library_shared { "libhidlbase", "libion", "libdmabufheap", - "libvmmem", "android.hardware.graphics.mapper@2.1", "android.hardware.graphics.mapper@3.0", "android.hardware.graphics.mapper@4.0", diff --git a/gralloc/gr_dma_mgr.cpp b/gralloc/gr_dma_mgr.cpp index 791ffafc..f45847b5 100644 --- a/gralloc/gr_dma_mgr.cpp +++ b/gralloc/gr_dma_mgr.cpp @@ -179,24 +179,18 @@ int DmaManager::UnmapBuffer(void *base, unsigned int size, unsigned int /*offset int DmaManager::SecureMemPerms(AllocData *data) { int ret = 0; + // Disable libvmmem calls until library is added to QIIFA CMD + /* std::unique_ptr<VmMem> vmmem = VmMem::CreateVmMem(); - if (!vmmem) { - return -ENOMEM; - } VmPerm vm_perms; for (auto vm_name : data->vm_names) { VmHandle handle = vmmem->FindVmByName(vm_name); - if (vm_name == "qcom,cp_sec_display" || vm_name == "qcom,cp_camera_preview") { - vm_perms.push_back(std::make_pair(handle, VMMEM_READ)); - } else if (vm_name == "qcom,cp_cdsp") { - vm_perms.push_back(std::make_pair(handle, VMMEM_READ | VMMEM_WRITE | VMMEM_EXEC)); - } else { - vm_perms.push_back(std::make_pair(handle, VMMEM_READ | VMMEM_WRITE)); - } + vm_perms.push_back(std::make_pair(handle, VMMEM_READ | VMMEM_WRITE)); } ret = vmmem->LendDmabuf(data->fd, vm_perms); + */ return ret; } diff --git a/gralloc/gr_dma_mgr.h b/gralloc/gr_dma_mgr.h index b0a2a8b4..2d5d1074 100644 --- a/gralloc/gr_dma_mgr.h +++ b/gralloc/gr_dma_mgr.h @@ -31,7 +31,6 @@ #define __GR_DMA_MGR_H__ #include <BufferAllocator/BufferAllocator.h> -#include <vmmem.h> #include <string> #include <vector> |