Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8391e3a5 authored by Suresh Vankadara's avatar Suresh Vankadara Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: Add support for mapping secure memory for CDSP access" into dev/msm-4.14-camx

parents 66ce17f5 da2e9d12

drivers/media/platform/msm/camera/cam_req_mgr/cam_mem_mgr.c

+6 −1
Original line number Diff line number Diff line
@@ -424,7 +424,12 @@ static int cam_mem_util_ion_alloc(struct cam_mem_mgr_alloc_cmd *cmd, 
	uint32_t ion_flag = 0;

	int rc;



	if (cmd->flags & CAM_MEM_FLAG_PROTECTED_MODE) {

	if ((cmd->flags & CAM_MEM_FLAG_PROTECTED_MODE) &&

		(cmd->flags & CAM_MEM_FLAG_CDSP_OUTPUT)) {

		heap_id = ION_HEAP(ION_SECURE_DISPLAY_HEAP_ID);

		ion_flag |=

			ION_FLAG_SECURE | ION_FLAG_CP_CAMERA | ION_FLAG_CP_CDSP;

	} else if (cmd->flags & CAM_MEM_FLAG_PROTECTED_MODE) {

		heap_id = ION_HEAP(ION_SECURE_DISPLAY_HEAP_ID);

		ion_flag |= ION_FLAG_SECURE | ION_FLAG_CP_CAMERA;

	} else {

include/uapi/media/cam_req_mgr.h

+1 −0
Original line number Diff line number Diff line
@@ -244,6 +244,7 @@ struct cam_req_mgr_link_control { 
#define CAM_MEM_FLAG_PACKET_BUF_TYPE            (1<<9)

#define CAM_MEM_FLAG_CACHE                      (1<<10)

#define CAM_MEM_FLAG_HW_SHARED_ACCESS           (1<<11)

#define CAM_MEM_FLAG_CDSP_OUTPUT                (1<<12)



#define CAM_MEM_MMU_MAX_HANDLE                  16