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

libgralloc: Change CAMERA_HEAP to ADSP_HEAP

Browse Source 
This changes GRALLOC_USAGE_PRIVATE_CAMERA_HEAP to
GRALLOC_USAGE_PRIVATE_ADSP_HEAP as the CAMERA_HEAP
is not used anymore

Change-Id: I5a95f68c4c7f4445ade2398dd239faad9ed16b22
This commit is contained in:
Arun Kumar K.R
2013-03-12 15:08:29 -07:00
parent 893a34a75b
commit 0daaa99ee9
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libgralloc/alloc_controller.cpp
View File

@@ -196,8 +196,8 @@ int IonController::allocate(alloc_data& data, int usage)
if(usage & GRALLOC_USAGE_PRIVATE_MM_HEAP) if(usage & GRALLOC_USAGE_PRIVATE_MM_HEAP)
ionFlags |= ION_HEAP(ION_CP_MM_HEAP_ID); ionFlags |= ION_HEAP(ION_CP_MM_HEAP_ID);
if(usage & GRALLOC_USAGE_PRIVATE_CAMERA_HEAP) if(usage & GRALLOC_USAGE_PRIVATE_ADSP_HEAP)
ionFlags |= ION_HEAP(ION_CAMERA_HEAP_ID); ionFlags |= ION_HEAP(ION_ADSP_HEAP_ID);
if(usage & GRALLOC_USAGE_PROTECTED && !noncontig) if(usage & GRALLOC_USAGE_PROTECTED && !noncontig)
ionFlags |= ION_SECURE; ionFlags |= ION_SECURE;

6
libgralloc/gralloc_priv.h
View File

@@ -47,8 +47,8 @@ enum {
GRALLOC_USAGE_PRIVATE_IOMMU_HEAP = GRALLOC_USAGE_PRIVATE_2, GRALLOC_USAGE_PRIVATE_IOMMU_HEAP = GRALLOC_USAGE_PRIVATE_2,
/* MM heap is a carveout heap for video, can be secured*/ /* MM heap is a carveout heap for video, can be secured*/
GRALLOC_USAGE_PRIVATE_MM_HEAP = GRALLOC_USAGE_PRIVATE_3, GRALLOC_USAGE_PRIVATE_MM_HEAP = GRALLOC_USAGE_PRIVATE_3,
/* CAMERA heap is a carveout heap for camera, is not secured*/ /* ADSP heap is a carveout heap, is not secured*/
GRALLOC_USAGE_PRIVATE_CAMERA_HEAP = 0x01000000, GRALLOC_USAGE_PRIVATE_ADSP_HEAP = 0x01000000,
/* Set this for allocating uncached memory (using O_DSYNC) /* Set this for allocating uncached memory (using O_DSYNC)
* cannot be used with noncontiguous heaps */ * cannot be used with noncontiguous heaps */
@@ -92,7 +92,7 @@ enum {
GRALLOC_USAGE_PRIVATE_SYSTEM_HEAP |\ GRALLOC_USAGE_PRIVATE_SYSTEM_HEAP |\
GRALLOC_USAGE_PRIVATE_IOMMU_HEAP |\ GRALLOC_USAGE_PRIVATE_IOMMU_HEAP |\
GRALLOC_USAGE_PRIVATE_MM_HEAP |\ GRALLOC_USAGE_PRIVATE_MM_HEAP |\
GRALLOC_USAGE_PRIVATE_CAMERA_HEAP) GRALLOC_USAGE_PRIVATE_ADSP_HEAP)
#define INTERLACE_MASK 0x80 #define INTERLACE_MASK 0x80
#define S3D_FORMAT_MASK 0xFF000 #define S3D_FORMAT_MASK 0xFF000