xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ion: Merge all ION related changes from msm-4.19 to msm-lahaina

Browse Source 
Merge all changes that deal with the ION memory manager from
msm-4.19 to msm-lahaina as of commit:

9dd0018410fe: Merge "clk: qcom: npucc-kona: Enable safe config and
HW_CTL for all RCGs".

Change-Id: I0c362ff9e6938883535467f0809ee360a733638e
Signed-off-by: Isaac J. Manjarres <isaacm@codeaurora.org>
This commit is contained in:
Isaac J. Manjarres
2019-07-26 12:45:13 -07:00
parent 52ad4bf5a2
commit fe5698e796
29 changed files with 3992 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/linux/dma-mapping.h
View File

@@ -798,10 +798,15 @@ static inline int dma_get_cache_alignment(void)
}
#ifdef CONFIG_DMA_DECLARE_COHERENT
struct dma_coherent_mem;
int dma_declare_coherent_memory(struct device *dev, phys_addr_t phys_addr,
dma_addr_t device_addr, size_t size);
void dma_release_declared_memory(struct device *dev);
dma_addr_t dma_get_device_base(struct device *dev,
struct dma_coherent_mem *mem);
unsigned long dma_get_size(struct dma_coherent_mem *mem);
#else
struct dma_coherent_mem {};
static inline int
dma_declare_coherent_memory(struct device *dev, phys_addr_t phys_addr,
dma_addr_t device_addr, size_t size)
@@ -813,6 +818,17 @@ static inline void
dma_release_declared_memory(struct device *dev)
{
}
static inline dma_addr_t dma_get_device_base(struct device *dev,
struct dma_coherent_mem *mem)
{
return 0;
}
static inline unsigned long dma_get_size(struct dma_coherent_mem *mem)
{
return 0;
}
#endif /* CONFIG_DMA_DECLARE_COHERENT */
static inline void *dmam_alloc_coherent(struct device *dev, size_t size,