CMA functions are not available to kernel modules, but the GK20A FB driver currently (and temporarily) relies on them.
This patch replaces the calls to CMA functions in problematic cases (CMA enabled and Nouveau compiled as a module) with dummy stubs that will make this particular driver fail, but at least won't produce a compile error.
This is a temporary fix until a better memory allocation scheme is devised.
Signed-off-by: Alexandre Courbot acourbot@nvidia.com --- drivers/gpu/drm/nouveau/core/subdev/fb/ramgk20a.c | 25 +++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/nouveau/core/subdev/fb/ramgk20a.c b/drivers/gpu/drm/nouveau/core/subdev/fb/ramgk20a.c index 5904af52e6d6..fa867ce5449e 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/fb/ramgk20a.c +++ b/drivers/gpu/drm/nouveau/core/subdev/fb/ramgk20a.c @@ -39,6 +39,27 @@ struct gk20a_mem { struct list_head head; };
+/* + * CMA is not available to modules. Until we find a better solution, make + * memory allocations fail in that case. + */ +#if IS_ENABLED(CONFIG_CMA) && IS_MODULE(CONFIG_DRM_NOUVEAU) +static inline struct page * +alloc_contiguous_memory(struct device *dev, int count, unsigned int order) +{ + dev_err(dev, "cannot use CMA from a module - allocation failed\n"); + return NULL; +} + +static inline void +release_contiguous_memory(struct device *dev, struct page *page, int count) +{ +} +#else +#define alloc_contiguous_memory(d, c, o) dma_alloc_from_contiguous(d, c, o) +#define release_contiguous_memory(d, p, c) dma_release_from_contiguous(d, p, c) +#endif + static void gk20a_ram_put(struct nouveau_fb *pfb, struct nouveau_mem **pmem) { @@ -51,7 +72,7 @@ gk20a_ram_put(struct nouveau_fb *pfb, struct nouveau_mem **pmem) return;
list_for_each_entry_safe(chunk, n, &mem->head, list) { - dma_release_from_contiguous(dev, chunk->pages, chunk->npages); + release_contiguous_memory(dev, chunk->pages, chunk->npages); kfree(chunk); }
@@ -128,7 +149,7 @@ gk20a_ram_get(struct nouveau_fb *pfb, u64 size, u32 align, u32 ncmin, return -ENOMEM; }
- chunk->pages = dma_alloc_from_contiguous(dev, ncmin, order); + chunk->pages = alloc_contiguous_memory(dev, ncmin, order); if (!chunk->pages) { kfree(chunk); gk20a_ram_put(pfb, pmem);