Piteball/android_kernel_samsung_msm8976
1
1
Fork 0
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git synced 2024-09-21 03:43:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge "ASoC: qdsp6v2: fallback to system heap only if smmu enabled"

Browse source
This commit is contained in:
Linux Build Service Account 2014-11-26 18:52:26 -08:00 committed by Gerrit - the friendly Code Review server
parent b06d837b8a a81ff5e78c
commit aa5c585c25
1 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
drivers/soc/qcom/qdsp6v2/msm_audio_ion.c
View file

@ -46,7 +46,7 @@ int msm_audio_ion_alloc(const char *name, struct ion_client **client,
struct ion_handle **handle, size_t bufsz, struct ion_handle **handle, size_t bufsz,
ion_phys_addr_t *paddr, size_t *pa_len, void **vaddr) ion_phys_addr_t *paddr, size_t *pa_len, void **vaddr)
{ {
int rc = 0; int rc = -EINVAL;
if ((msm_audio_ion_data.smmu_enabled == true) && if ((msm_audio_ion_data.smmu_enabled == true) &&
(msm_audio_ion_data.group == NULL)) { (msm_audio_ion_data.group == NULL)) {
@ -67,22 +67,26 @@ int msm_audio_ion_alloc(const char *name, struct ion_client **client,
*handle = ion_alloc(*client, bufsz, SZ_4K, *handle = ion_alloc(*client, bufsz, SZ_4K,
ION_HEAP(ION_AUDIO_HEAP_ID), 0); ION_HEAP(ION_AUDIO_HEAP_ID), 0);
if (IS_ERR_OR_NULL((void *) (*handle))) { if (IS_ERR_OR_NULL((void *) (*handle))) {
pr_debug("system heap is used"); if (msm_audio_ion_data.smmu_enabled == true) {
msm_audio_ion_data.audioheap_enabled = 0; pr_debug("system heap is used");
*handle = ion_alloc(*client, bufsz, SZ_4K, msm_audio_ion_data.audioheap_enabled = 0;
ION_HEAP(ION_SYSTEM_HEAP_ID), 0); *handle = ion_alloc(*client, bufsz, SZ_4K,
ION_HEAP(ION_SYSTEM_HEAP_ID), 0);
}
if (IS_ERR_OR_NULL((void *) (*handle))) {
if ((void *)(*handle) != NULL)
rc = *(int *)(*handle);
else
rc = -ENOMEM;
pr_err("%s:ION mem alloc fail rc=%d, smmu_enabled=%d\n",
__func__, rc, msm_audio_ion_data.smmu_enabled);
goto err_ion_client;
}
} else { } else {
pr_debug("audio heap is used"); pr_debug("audio heap is used");
msm_audio_ion_data.audioheap_enabled = 1; msm_audio_ion_data.audioheap_enabled = 1;
} }
if (IS_ERR_OR_NULL((void *) (*handle))) {
pr_err("%s: ION memory allocation for AUDIO failed rc=%d, smmu_enabled=%d\n",
__func__, rc, msm_audio_ion_data.smmu_enabled);
goto err_ion_client;
}
rc = msm_audio_ion_get_phys(*client, *handle, paddr, pa_len); rc = msm_audio_ion_get_phys(*client, *handle, paddr, pa_len);
if (rc) { if (rc) {
pr_err("%s: ION Get Physical for AUDIO failed, rc = %d\n", pr_err("%s: ION Get Physical for AUDIO failed, rc = %d\n",
@ -103,7 +107,7 @@ int msm_audio_ion_alloc(const char *name, struct ion_client **client,
memset((void *)*vaddr, 0, bufsz); memset((void *)*vaddr, 0, bufsz);
} }
return 0; return rc;
err_ion_handle: err_ion_handle:
ion_free(*client, *handle); ion_free(*client, *handle);
@ -112,7 +116,7 @@ err_ion_client:
*handle = NULL; *handle = NULL;
*client = NULL; *client = NULL;
err: err:
return -EINVAL; return rc;
} }
int msm_audio_ion_import(const char *name, struct ion_client **client, int msm_audio_ion_import(const char *name, struct ion_client **client,