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

Merge "gralloc: Make all secure heaps and flags backward compatible"

Browse Source
This commit is contained in:
Linux Build Service Account
2015-04-29 08:20:37 -07:00
committed by Gerrit - the friendly Code Review server
parent 239a7a9f8d 3c49041532
commit 3eac1c3cd9
3 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
libgralloc/alloc_controller.cpp
View File

@@ -49,17 +49,28 @@
#define ASTC_BLOCK_SIZE 16
#ifdef ION_FLAG_CP_PIXEL
#define CP_HEAP_ID ION_SECURE_HEAP_ID
#else
#ifndef ION_FLAG_CP_PIXEL
#define ION_FLAG_CP_PIXEL 0
#define CP_HEAP_ID ION_CP_MM_HEAP_ID
#endif
#ifndef ION_FLAG_ALLOW_NON_CONTIG
#define ION_FLAG_ALLOW_NON_CONTIG 0
#endif
#ifdef MASTER_SIDE_CP
#define CP_HEAP_ID ION_SECURE_HEAP_ID
/* Please Add the new SD ION Heap here */
#define SD_HEAP_ID 0
#define ION_CP_FLAGS (ION_SECURE | ION_FLAG_CP_PIXEL)
/* Please Add the new SD ION Flag here */
#define ION_SD_FLAGS ION_SECURE
#else // SLAVE_SIDE_CP
#define CP_HEAP_ID ION_CP_MM_HEAP_ID
#define SD_HEAP_ID CP_HEAP_ID
#define ION_CP_FLAGS (ION_SECURE | ION_FLAG_ALLOW_NON_CONTIG)
#define ION_SD_FLAGS ION_SECURE
#endif
using namespace gralloc;
using namespace qdutils;
@@ -357,21 +368,16 @@ int IonController::allocate(alloc_data& data, int usage)
if(usage & GRALLOC_USAGE_PROTECTED) {
if (usage & GRALLOC_USAGE_PRIVATE_MM_HEAP) {
ionHeapId = ION_HEAP(CP_HEAP_ID);
ionFlags |= ION_SECURE;
if (usage & GRALLOC_USAGE_PRIVATE_SECURE_DISPLAY) {
ionHeapId = ION_HEAP(SD_HEAP_ID);
/*
* There is currently no flag in ION for Secure Display
* VM. Please add it here once available.
*
ionFlags |= <Ion flag for Secure Display>;
* VM. Please add it to the define once available.
*/
ionFlags |= ION_SD_FLAGS;
} else {
ionFlags |= ION_FLAG_CP_PIXEL;
}
if (!(usage & GRALLOC_USAGE_PRIVATE_SECURE_DISPLAY)) {
ionFlags |= ION_FLAG_ALLOW_NON_CONTIG;
ionHeapId = ION_HEAP(CP_HEAP_ID);
ionFlags |= ION_CP_FLAGS;
}
} else {
// for targets/OEMs which do not need HW level protection