Merge "Revert "msm: camera: Skip cache CPU SYNC for non-secure buffers"" (cea03712) · Commits · e / devices / android_kernel_oneplus_sm8150

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

+0 −6

Original line number	Diff line number	Diff line
		@@ -1022,9 +1022,6 @@ static int cam_smmu_map_buffer_and_add_to_list(int idx, int ion_fd,
		goto err_put;
		}

		/* cache flush/invalidation is done by buffer provider */
		attach->dma_map_attrs \|= DMA_ATTR_SKIP_CPU_SYNC;

		table = dma_buf_map_attachment(attach, dma_dir);
		if (IS_ERR_OR_NULL(table)) {
		rc = PTR_ERR(table);
		@@ -1107,9 +1104,6 @@ static int cam_smmu_unmap_buf_and_remove_from_list(
		return -EINVAL;
		}

		/* skip cache operations */
		mapping_info->attach->dma_map_attrs \|= DMA_ATTR_SKIP_CPU_SYNC;

		/* iommu buffer clean up */
		dma_buf_unmap_attachment(mapping_info->attach,
		mapping_info->table, mapping_info->dir);