Merge "msm: camera: smmu: get iommu mapping for context bank" (28c89c86) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/media/platform/msm/camera_v2/common/cam_smmu_api.c

+8 −3

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@
		#include <linux/dma-attrs.h>
		#include <linux/of_platform.h>
		#include <linux/iommu.h>
		#include <linux/qcom_iommu.h>
		#include <linux/dma-mapping.h>
		#include <linux/msm_dma_iommu_mapping.h>
		#include "cam_smmu_api.h"
		@@ -1510,9 +1511,13 @@ static int cam_populate_smmu_context_banks(struct device *dev,
		cb->name, cb->is_secure, cb->scratch_buf_support);

		/* set up the iommu mapping for the context bank */
		if (type == CAM_QSMMU) {
		ctx = msm_iommu_get_ctx(cb->name);
		CDBG("getting QSMMU ctx : %s\n", cb->name);
		} else {
		ctx = dev;
		CDBG("getting Arm SMMU ctx : %s\n", cb->name);

		}
		rc = cam_smmu_setup_cb(cb, ctx);
		if (rc < 0)
		pr_err("Error: failed to setup cb : %s\n", cb->name);