Merge "dsp: use dma handle as default input in hab export" (017e8daf) · Commits · e / devices / android_kernel_fairphone_FP4

dsp/msm_audio_ion_vm.c

+4 −6

Original line number	Diff line number	Diff line
		@@ -306,7 +306,6 @@ static int msm_audio_ion_smmu_map(void *handle,
		struct msm_audio_smmu_vm_map_cmd_rsp cmd_rsp;
		struct msm_audio_alloc_data *alloc_data = NULL;
		unsigned long delay = jiffies + (HZ / 2);
		void *vaddr;

		len = ((struct dma_buf)handle)->size;

		@@ -315,14 +314,13 @@ static int msm_audio_ion_smmu_map(void *handle,
		list) {
		if (alloc_data->handle == handle) {
		found = true;
		vaddr = alloc_data->vaddr;

		/* Export the buffer to physical VM */
		rc = habmm_export(msm_audio_ion_hab_handle, vaddr, *len,
		&export_id, 0);
		rc = habmm_export(msm_audio_ion_hab_handle, handle, *len,
		&export_id, HABMM_EXPIMP_FLAGS_DMABUF);
		if (rc) {
		pr_err("%s: habmm_export failed vaddr = %pK, len = %zd, rc = %d\n",
		__func__, vaddr, *len, rc);
		pr_err("%s: habmm_export failed handle = %pK, len = %zd, rc = %d\n",
		__func__, handle, *len, rc);
		goto err;
		}