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

Commit 613e356b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "staging: android: ion: Add support for SPSS vmids" into msm-4.14

parents 379d7370 11792144

drivers/staging/android/ion/ion_secure_util.c

+10 −1
Original line number Diff line number Diff line
@@ -27,7 +27,10 @@ bool is_secure_vmid_valid(int vmid) 
		vmid == VMID_CP_CAMERA ||

		vmid == VMID_CP_SEC_DISPLAY ||

		vmid == VMID_CP_APP ||

		vmid == VMID_CP_CAMERA_PREVIEW);

		vmid == VMID_CP_CAMERA_PREVIEW ||

		vmid == VMID_CP_SPSS_SP ||

		vmid == VMID_CP_SPSS_SP_SHARED ||

		vmid == VMID_CP_SPSS_HLOS_SHARED);

}



int get_secure_vmid(unsigned long flags)
@@ -48,6 +51,12 @@ int get_secure_vmid(unsigned long flags) 
		return VMID_CP_APP;

	if (flags & ION_FLAG_CP_CAMERA_PREVIEW)

		return VMID_CP_CAMERA_PREVIEW;

	if (flags & ION_FLAG_CP_SPSS_SP)

		return VMID_CP_SPSS_SP;

	if (flags & ION_FLAG_CP_SPSS_SP_SHARED)

		return VMID_CP_SPSS_SP_SHARED;

	if (flags & ION_FLAG_CP_SPSS_HLOS_SHARED)

		return VMID_CP_SPSS_HLOS_SHARED;

	return -EINVAL;

}