Merge "dsp: update dma_buf cache ops"

This commit is contained in:
Linux Build Service Account
2018-03-14 17:14:31 -07:00
committed by Gerrit - the friendly Code Review server

View File

@@ -599,18 +599,11 @@ int msm_audio_ion_cache_operations(struct audio_buffer *abuff, int cache_op)
/* MSM_AUDIO_ION_INV_CACHES or MSM_AUDIO_ION_CLEAN_CACHES */ /* MSM_AUDIO_ION_INV_CACHES or MSM_AUDIO_ION_CLEAN_CACHES */
switch (cache_op) { switch (cache_op) {
case MSM_AUDIO_ION_INV_CACHES: case MSM_AUDIO_ION_INV_CACHES:
rc = dma_buf_begin_cpu_access(abuff->dma_buf,
DMA_BIDIRECTIONAL);
if (rc)
pr_err("%s: failed to invalidate caches. rc = %d\n",
__func__, rc);
break;
case MSM_AUDIO_ION_CLEAN_CACHES: case MSM_AUDIO_ION_CLEAN_CACHES:
rc = dma_buf_end_cpu_access(abuff->dma_buf, dma_buf_begin_cpu_access(abuff->dma_buf,
DMA_BIDIRECTIONAL); DMA_BIDIRECTIONAL);
if (rc) dma_buf_end_cpu_access(abuff->dma_buf,
pr_err("%s: failed to clean caches. rc = %d\n", DMA_BIDIRECTIONAL);
__func__, rc);
break; break;
default: default:
pr_err("%s: Invalid cache operation %d\n", pr_err("%s: Invalid cache operation %d\n",