Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions audioreach-driver/ar_kcompat.h
Original file line number Diff line number Diff line change
Expand Up @@ -82,4 +82,17 @@
# define AR_MODULE_IMPORT_NS(ns) MODULE_IMPORT_NS(ns)
#endif

/* dev->dma_coherent direct field access changed in newer kernels. */
#if LINUX_VERSION_CODE >= KERNEL_VERSION(7, 2, 0)
# define AR_HAVE_DEV_SET_DMA_COHERENT 1
#else
# define AR_HAVE_DEV_SET_DMA_COHERENT 0
#endif

#if AR_HAVE_DEV_SET_DMA_COHERENT
# define AR_SET_DMA_COHERENT(dev) dev_set_dma_coherent(dev)
#else
# define AR_SET_DMA_COHERENT(dev) ((dev)->dma_coherent = true)
#endif

#endif /* __AR_KCOMPAT_H__ */
2 changes: 1 addition & 1 deletion audioreach-driver/q6apm_audio_mem.c
Original file line number Diff line number Diff line change
Expand Up @@ -835,7 +835,7 @@ static int q6apm_audio_mem_probe(struct platform_device *pdev)
dev_info(dev, "%s: SMMU is %s\n", __func__,
(!msm_audio_mem_data->smmu_enabled) ? "Disabled" : "Enabled");

dev->dma_coherent = true;
AR_SET_DMA_COHERENT(dev);
if (msm_audio_mem_data->smmu_enabled) {
/* Get SMMU SID information from Devicetree */
smmu_sid_mask = QCOM_SMMU_SID_MASK;
Expand Down
Loading