LineageOS/android_vendor_qcom_opensource_display-commonsys-intf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "gralloc: Use PROTECTED flag for L1 allocations"

Browse Source
This commit is contained in:
Linux Build Service Account
2016-04-22 08:39:23 -07:00
committed by Gerrit - the friendly Code Review server
parent 375b321097 934a4c33e3
commit 7e0e63159d
1 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libgralloc/alloc_controller.cpp
View File

@@ -457,7 +457,6 @@ int IonController::allocate(alloc_data& data, int usage)
data.allocType = 0; data.allocType = 0;
if(usage & GRALLOC_USAGE_PROTECTED) { if(usage & GRALLOC_USAGE_PROTECTED) {
if (usage & GRALLOC_USAGE_PRIVATE_MM_HEAP) {
if (usage & GRALLOC_USAGE_PRIVATE_SECURE_DISPLAY) { if (usage & GRALLOC_USAGE_PRIVATE_SECURE_DISPLAY) {
ionHeapId = ION_HEAP(SD_HEAP_ID); ionHeapId = ION_HEAP(SD_HEAP_ID);
/* /*
@@ -469,12 +468,6 @@ int IonController::allocate(alloc_data& data, int usage)
ionHeapId = ION_HEAP(CP_HEAP_ID); ionHeapId = ION_HEAP(CP_HEAP_ID);
ionFlags |= ION_CP_FLAGS; ionFlags |= ION_CP_FLAGS;
} }
} else {
// for targets/OEMs which do not need HW level protection
// do not set ion secure flag & MM heap. Fallback to system heap.
ionHeapId |= ION_HEAP(ION_SYSTEM_HEAP_ID);
data.allocType |= private_handle_t::PRIV_FLAGS_PROTECTED_BUFFER;
}
} else if(usage & GRALLOC_USAGE_PRIVATE_MM_HEAP) { } else if(usage & GRALLOC_USAGE_PRIVATE_MM_HEAP) {
//MM Heap is exclusively a secure heap. //MM Heap is exclusively a secure heap.
//If it is used for non secure cases, fallback to IOMMU heap //If it is used for non secure cases, fallback to IOMMU heap