mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-10 22:40:54 -04:00
Merge "defconfig: Enable the MSM ION heaps on Lahaina"
This commit is contained in:
commit
3cd94d01cd
2 changed files with 6 additions and 0 deletions
|
|
@ -10,3 +10,4 @@ CONFIG_QCOM_SECURE_BUFFER=y
|
|||
CONFIG_EDAC_KRYO_ARM64=y
|
||||
CONFIG_EDAC_KRYO_ARM64_PANIC_ON_UE=y
|
||||
CONFIG_SPARSEMEM_VMEMMAP=y
|
||||
CONFIG_ION_MSM_HEAPS=y
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@
|
|||
#include <linux/vmalloc.h>
|
||||
|
||||
#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;
|
||||
|
|
|
|||
Loading…
Reference in a new issue