A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-07 20:33:58 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "soc: qcom: secure_buffer: Add support for qcom,vmid-cp-camera-preview-ro"

Browse source
This commit is contained in:
qctecmdr 2020-09-02 08:39:50 -07:00 • committed by Gerrit - the friendly Code Review server
commit f161e424eb
1 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

22
drivers/soc/qcom/secure_buffer.c
View file

@ -23,6 +23,7 @@
#define BATCH_MAX_SECTIONS 32
static struct device *qcom_secure_buffer_dev;
static bool vmid_cp_camera_preview_ro;
static struct qcom_scm_current_perm_info *
populate_dest_info(int *dest_vmids, int nelements, int *dest_perms,
@ -296,7 +297,8 @@ EXPORT_SYMBOL(msm_secure_vmid_to_string);
u32 msm_secure_get_vmid_perms(u32 vmid)
{
if (vmid == VMID_CP_SEC_DISPLAY)
if (vmid == VMID_CP_SEC_DISPLAY || (vmid == VMID_CP_CAMERA_PREVIEW &&
vmid_cp_camera_preview_ro))
return PERM_READ;
else if (vmid == VMID_CP_CDSP)
return PERM_READ | PERM_WRITE | PERM_EXEC;
@ -307,17 +309,19 @@ EXPORT_SYMBOL(msm_secure_get_vmid_perms);
static int qcom_secure_buffer_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
int ret;
#ifdef CONFIG_ARM64
ret = dma_set_mask(&pdev->dev, DMA_BIT_MASK(64));
#else
ret = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
#endif
if (!ret)
qcom_secure_buffer_dev = &pdev->dev;
if (IS_ENABLED(CONFIG_ARM64)) {
ret = dma_set_mask(dev, DMA_BIT_MASK(64));
if (ret)
return ret;
}
return ret;
qcom_secure_buffer_dev = dev;
vmid_cp_camera_preview_ro = of_property_read_bool(dev->of_node,
"qcom,vmid-cp-camera-preview-ro");
return 0;
}
static const struct of_device_id qcom_secure_buffer_of_match[] = {