Merge "msm_11ad: Set atomic attribute to SMMU driver" (31719b37) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/platform/msm/msm_11ad/msm_11ad.c

+10 −0

Original line number	Diff line number	Diff line
		@@ -126,6 +126,7 @@ static int ops_resume(void *handle)
		static int msm_11ad_smmu_init(struct msm11ad_ctx *ctx)
		{
		int disable_htw = 1;
		int atomic_ctx = 1;
		int rc;

		if (!ctx->use_smmu)
		@@ -151,6 +152,15 @@ static int msm_11ad_smmu_init(struct msm11ad_ctx *ctx)
		rc);
		}

		rc = iommu_domain_set_attr(ctx->mapping->domain,
		DOMAIN_ATTR_ATOMIC,
		&atomic_ctx);
		if (rc) {
		dev_err(ctx->dev, "Set atomic attribute to SMMU failed (%d)\n",
		rc);
		goto release_mapping;
		}

		rc = arm_iommu_attach_device(&ctx->pcidev->dev, ctx->mapping);
		if (rc) {
		dev_err(ctx->dev, "arm_iommu_attach_device failed (%d)\n", rc);