samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "msm: camera: memmgr: Add support for non pix secure buffers" into camera-kernel.lnx.5.0

Browse Source
This commit is contained in:
Savita Patted
2021-07-08 18:59:30 -07:00
committed by Gerrit - the friendly Code Review server
parent 925d649642 e2c7402dfd
commit 769d026c3a
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/cam_req_mgr/cam_mem_mgr.c
View File

@@ -578,6 +578,11 @@ static int cam_mem_util_get_dma_buf(size_t len,
perms[num_vmids] = PERM_READ | PERM_WRITE; perms[num_vmids] = PERM_READ | PERM_WRITE;
num_vmids++; num_vmids++;
} }
} else if (cam_flags & CAM_MEM_FLAG_EVA_NOPIXEL) {
heap = tbl.secure_display_heap;
vmids[num_vmids] = VMID_CP_NON_PIXEL;
perms[num_vmids] = PERM_READ | PERM_WRITE;
num_vmids++;
} else if (use_cached_heap) { } else if (use_cached_heap) {
try_heap = tbl.camera_heap; try_heap = tbl.camera_heap;
heap = tbl.system_heap; heap = tbl.system_heap;
@@ -618,7 +623,8 @@ static int cam_mem_util_get_dma_buf(size_t len,
} }
} }
if (cam_flags & CAM_MEM_FLAG_PROTECTED_MODE) { if ((cam_flags & CAM_MEM_FLAG_PROTECTED_MODE) ||
(cam_flags & CAM_MEM_FLAG_EVA_NOPIXEL)) {
if (num_vmids >= CAM_MAX_VMIDS) { if (num_vmids >= CAM_MAX_VMIDS) {
CAM_ERR(CAM_MEM, "Insufficient array size for vmids %d", num_vmids); CAM_ERR(CAM_MEM, "Insufficient array size for vmids %d", num_vmids);
rc = -EINVAL; rc = -EINVAL;
@@ -765,6 +771,13 @@ static int cam_mem_util_check_alloc_flags(struct cam_mem_mgr_alloc_cmd *cmd)
return -EINVAL; return -EINVAL;
} }
if ((cmd->flags & CAM_MEM_FLAG_EVA_NOPIXEL) &&
(cmd->flags & CAM_MEM_FLAG_PROTECTED_MODE ||
cmd->flags & CAM_MEM_FLAG_KMD_ACCESS)){
CAM_ERR(CAM_MEM,
"Kernel mapping and secure mode not allowed in no pixel mode");
return -EINVAL;
}
return 0; return 0;
} }

1
include/uapi/camera/media/cam_req_mgr.h
View File

@@ -291,6 +291,7 @@ struct cam_req_mgr_link_control {
#define CAM_MEM_FLAG_CDSP_OUTPUT (1<<12) #define CAM_MEM_FLAG_CDSP_OUTPUT (1<<12)
#define CAM_MEM_FLAG_DISABLE_DELAYED_UNMAP (1<<13) #define CAM_MEM_FLAG_DISABLE_DELAYED_UNMAP (1<<13)
#define CAM_MEM_FLAG_KMD_DEBUG_FLAG (1<<14) #define CAM_MEM_FLAG_KMD_DEBUG_FLAG (1<<14)
#define CAM_MEM_FLAG_EVA_NOPIXEL (1<<15)
#define CAM_MEM_MMU_MAX_HANDLE 16 #define CAM_MEM_MMU_MAX_HANDLE 16