Introduce a flag that allows a user to request non-coherent buffers allocated via the GEM DMA helper for bidirectional use.
Keep current behaviour (DMA_TO_DEVICE mapping) as default, with no change required for existing GEM DMA users.
While it hasn't been the case until now, some devices like NXP's Neutron Neural Processing Unit (NPU) require contiguous, non-coherent DMA buffers they can both read from and write to. Unlike traditional DRM devices, Neutron uses the same DMA buffer both for reading model data and for writing inference output.
Neutron's usage scenario is a good match for the GEM DMA helpers, except for the fact that current implementation only considers the DMA_TO_DEVICE direction.
Signed-off-by: Ioana Ciocoi-Radulescu ruxandra.radulescu@nxp.com --- drivers/gpu/drm/drm_gem_dma_helper.c | 6 ++++-- include/drm/drm_gem_dma_helper.h | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/drm_gem_dma_helper.c b/drivers/gpu/drm/drm_gem_dma_helper.c index ecb9746f4da8..dbf5ad4426d3 100644 --- a/drivers/gpu/drm/drm_gem_dma_helper.c +++ b/drivers/gpu/drm/drm_gem_dma_helper.c @@ -148,7 +148,8 @@ struct drm_gem_dma_object *drm_gem_dma_create(struct drm_device *drm, if (dma_obj->map_noncoherent) { dma_obj->vaddr = dma_alloc_noncoherent(drm->dev, size, &dma_obj->dma_addr, - DMA_TO_DEVICE, + dma_obj->map_bidirectional ? + DMA_BIDIRECTIONAL : DMA_TO_DEVICE, GFP_KERNEL | __GFP_NOWARN); } else { dma_obj->vaddr = dma_alloc_wc(drm->dev, size, @@ -238,7 +239,8 @@ void drm_gem_dma_free(struct drm_gem_dma_object *dma_obj) if (dma_obj->map_noncoherent) dma_free_noncoherent(gem_obj->dev->dev, dma_obj->base.size, dma_obj->vaddr, dma_obj->dma_addr, - DMA_TO_DEVICE); + dma_obj->map_bidirectional ? + DMA_BIDIRECTIONAL : DMA_TO_DEVICE); else dma_free_wc(gem_obj->dev->dev, dma_obj->base.size, dma_obj->vaddr, dma_obj->dma_addr); diff --git a/include/drm/drm_gem_dma_helper.h b/include/drm/drm_gem_dma_helper.h index f2678e7ecb98..e0022f2fdfef 100644 --- a/include/drm/drm_gem_dma_helper.h +++ b/include/drm/drm_gem_dma_helper.h @@ -17,6 +17,8 @@ struct drm_mode_create_dumb; * DMA addresses. * @vaddr: kernel virtual address of the backing memory * @map_noncoherent: if true, the GEM object is backed by non-coherent memory + * @map_bidirectional: valid only if map_noncoherent flag is set. If true, allow + * bidirectional use of the non-coherent memory buffer */ struct drm_gem_dma_object { struct drm_gem_object base; @@ -27,6 +29,7 @@ struct drm_gem_dma_object { void *vaddr;
bool map_noncoherent; + bool map_bidirectional; };
#define to_drm_gem_dma_obj(gem_obj) \