Merge "msm: camera: Support for secure camera on 8994" (fa702f57) · Commits · e / devices / android_kernel_sony_msm8994

drivers/media/platform/msm/camera_v2/isp/msm_isp46.c

+9 −0

Original line number	Diff line number	Diff line
		@@ -1700,6 +1700,14 @@ static int msm_vfe46_get_platform_data(struct vfe_device *vfe_dev)
		rc = -ENODEV;
		goto vfe_no_resource;
		}
		if (vfe_dev->hw_info->num_iommu_secure_ctx) {
		vfe_dev->iommu_secure_ctx[0] = msm_iommu_get_ctx("vfe_secure");
		if (!vfe_dev->iommu_secure_ctx[0]) {
		pr_err("%s: cannot get secure iommu_ctx\n", __func__);
		rc = -ENODEV;
		goto vfe_no_resource;
		}
		}

		vfe_no_resource:
		return rc;
		@@ -1782,6 +1790,7 @@ static struct v4l2_subdev_internal_ops msm_vfe46_internal_ops = {

		struct msm_vfe_hardware_info vfe46_hw_info = {
		.num_iommu_ctx = 1,
		.num_iommu_secure_ctx = 1,
		.vfe_clk_idx = VFE46_CLK_IDX,
		.vfe_ops = {
		.irq_ops = {