diff options
| author | Linus Torvalds | 2020-07-19 11:28:23 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2020-07-19 11:28:23 -0700 |
| commit | 8c18fc6344568bdc131436be0345d82da512bfef (patch) | |
| tree | 0bad0c4f5d44806d842eff89ad1d6dbfb4a923cf /include/linux | |
| parent | f932d58abc38c898d7d3fe635ecb2b821a256f54 (diff) | |
| parent | d9765e41d8e9ea2251bf73735a2895c8bad546fc (diff) | |
Merge tag 'dma-mapping-5.8-6' of git://git.infradead.org/users/hch/dma-mapping into master
Pull dma-mapping fixes from Christoph Hellwig:
"Ensure we always have fully addressable memory in the dma coherent
pool (Nicolas Saenz Julienne)"
* tag 'dma-mapping-5.8-6' of git://git.infradead.org/users/hch/dma-mapping:
dma-pool: do not allocate pool memory from CMA
dma-pool: make sure atomic pool suits device
dma-pool: introduce dma_guess_pool()
dma-pool: get rid of dma_in_atomic_pool()
dma-direct: provide function to check physical memory area validity
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/dma-direct.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/dma-direct.h b/include/linux/dma-direct.h index 5184735a0fe8..ab2e20cba951 100644 --- a/include/linux/dma-direct.h +++ b/include/linux/dma-direct.h @@ -69,6 +69,7 @@ static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size, u64 dma_direct_get_required_mask(struct device *dev); gfp_t dma_direct_optimal_gfp_mask(struct device *dev, u64 dma_mask, u64 *phys_mask); +bool dma_coherent_ok(struct device *dev, phys_addr_t phys, size_t size); void *dma_direct_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t gfp, unsigned long attrs); void dma_direct_free(struct device *dev, size_t size, void *cpu_addr, |