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

display: Use GRALLOC_USAGE_PROTECTED to indicate secure content

Browse Source 
For secure content, use GRALLOC_USAGE_PROTECTED flag instead of
the obsolete flag GRALLOC_USAGE_PRIVATE_CP_BUFFER.

Change-Id: I69bf8cfd3a978fd472608beb44056e1bf55c1414
This commit is contained in:
Sushil Chauhan
2013-01-08 16:08:09 -08:00
committed by Gerrit - the friendly Code Review server
parent 8714496fd4
commit 7651a80dc9
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libgralloc/alloc_controller.cpp
View File

@@ -62,8 +62,7 @@ static bool canFallback(int usage, bool triedSystem)
return false; return false;
if(triedSystem) if(triedSystem)
return false; return false;
if(usage & (GRALLOC_HEAP_MASK | GRALLOC_USAGE_PROTECTED | if(usage & (GRALLOC_HEAP_MASK | GRALLOC_USAGE_PROTECTED))
GRALLOC_USAGE_PRIVATE_CP_BUFFER))
return false; return false;
if(usage & (GRALLOC_HEAP_MASK | GRALLOC_USAGE_PRIVATE_EXTERNAL_ONLY)) if(usage & (GRALLOC_HEAP_MASK | GRALLOC_USAGE_PRIVATE_EXTERNAL_ONLY))
return false; return false;
@@ -124,7 +123,7 @@ int IonController::allocate(alloc_data& data, int usage)
if(usage & GRALLOC_USAGE_PRIVATE_CAMERA_HEAP) if(usage & GRALLOC_USAGE_PRIVATE_CAMERA_HEAP)
ionFlags |= ION_HEAP(ION_CAMERA_HEAP_ID); ionFlags |= ION_HEAP(ION_CAMERA_HEAP_ID);
if(usage & GRALLOC_USAGE_PRIVATE_CP_BUFFER) if(usage & GRALLOC_USAGE_PROTECTED)
ionFlags |= ION_SECURE; ionFlags |= ION_SECURE;
// if no flags are set, default to // if no flags are set, default to

3
libgralloc/gpu.cpp
View File

@@ -252,8 +252,7 @@ int gpu_context_t::alloc_impl(int w, int h, int format, int usage,
// All buffers marked as protected or for external // All buffers marked as protected or for external
// display need to go to overlay // display need to go to overlay
if ((usage & GRALLOC_USAGE_EXTERNAL_DISP) || if ((usage & GRALLOC_USAGE_EXTERNAL_DISP) ||
(usage & GRALLOC_USAGE_PROTECTED) || (usage & GRALLOC_USAGE_PROTECTED)) {
(usage & GRALLOC_USAGE_PRIVATE_CP_BUFFER)) {
bufferType = BUFFER_TYPE_VIDEO; bufferType = BUFFER_TYPE_VIDEO;
} }

2
liboverlay/overlayMem.h
View File

@@ -120,7 +120,7 @@ inline bool OvMem::open(uint32_t numbufs,
int allocFlags = GRALLOC_USAGE_PRIVATE_IOMMU_HEAP; int allocFlags = GRALLOC_USAGE_PRIVATE_IOMMU_HEAP;
if(isSecure) { if(isSecure) {
allocFlags = GRALLOC_USAGE_PRIVATE_MM_HEAP; allocFlags = GRALLOC_USAGE_PRIVATE_MM_HEAP;
allocFlags |= GRALLOC_USAGE_PRIVATE_CP_BUFFER; allocFlags |= GRALLOC_USAGE_PROTECTED;
allocFlags |= GRALLOC_USAGE_PRIVATE_UNCACHED; allocFlags |= GRALLOC_USAGE_PRIVATE_UNCACHED;
} }