From b0cbb06dd1cee26f3957fc0ec1d44b2a4a75247e Mon Sep 17 00:00:00 2001 From: "Isaac J. Manjarres" Date: Wed, 7 Aug 2019 10:05:58 -0700 Subject: [PATCH] staging: android: ion: Use the MSM dmabuf ops when possible Use the MSM dmabuf operations for cache maintenance on ION buffers if they are present. Otherwise, fallback to the default ION dmabuf operations. Change-Id: I56e7eabb2614a958aca11c9c1fa4ecd5415ce96a Signed-off-by: Isaac J. Manjarres --- drivers/staging/android/ion/ion.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c index 7142185c9410..3e5457289dac 100644 --- a/drivers/staging/android/ion/ion.c +++ b/drivers/staging/android/ion/ion.c @@ -27,6 +27,7 @@ #include #include "ion.h" +#include "msm_ion_priv.h" static struct ion_device *internal_dev; @@ -427,7 +428,11 @@ static struct dma_buf *ion_alloc_dmabuf(size_t len, unsigned int heap_id_mask, if (IS_ERR(buffer)) return ERR_CAST(buffer); +#if IS_ENABLED(CONFIG_ION_MSM_HEAPS) + exp_info.ops = &msm_ion_dma_buf_ops; +#else exp_info.ops = &dma_buf_ops; +#endif exp_info.size = buffer->size; exp_info.flags = O_RDWR; exp_info.priv = buffer;