A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-10 22:40:54 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "dsp: unmap cma memory before hyp unassign during adm close"

Browse source
This commit is contained in:
qctecmdr 2020-11-25 18:57:01 -08:00 • committed by Gerrit - the friendly Code Review server
commit f3bf502f35
1 changed files with 25 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

25
dsp/q6adm.c
View file

@ -4005,6 +4005,20 @@ int adm_close(int port_id, int perf_mode, int copp_idx)
ret = -EINVAL;
goto fail;
}
/**
* call unmap CMA before hyp unassign during
* end of handset/speaker usecase.
*/
if (cal_block->map_data.q6map_handle != 0) {
atomic_set(&this_adm.mem_map_handles[cal_index],
cal_block->map_data.q6map_handle);
atomic_set(&this_adm.mem_map_index, cal_index);
ret = adm_memory_unmap_regions();
if (ret < 0)
pr_err("%s: unmap did not work! cal_type %i ret %d\n",
__func__, cal_index, ret);
cal_block->map_data.q6map_handle = 0;
}
ret = hyp_assign_phys(
cal_block->cal_data.paddr,
cal_block->map_data.map_size,
@ -4076,6 +4090,17 @@ int adm_close(int port_id, int perf_mode, int copp_idx)
ret = -EINVAL;
goto fail;
}
/* call unmap CMA before hyp unassign during end of handset/speaker usecase */
if (cal_block->map_data.q6map_handle != 0) {
atomic_set(&this_adm.mem_map_handles[cal_index],
cal_block->map_data.q6map_handle);
atomic_set(&this_adm.mem_map_index, cal_index);
ret = adm_memory_unmap_regions();
if (ret < 0)
pr_err("%s: unmap did not work! cal_type %i ret %d\n",
__func__, cal_index, ret);
cal_block->map_data.q6map_handle = 0;
}
ret = hyp_assign_phys(cal_block->cal_data.paddr,
cal_block->map_data.map_size,
source_vm, 2, dest_vm,