Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/cma-helper: Release non-coherent memory with dma_free_noncoherent()

The GEM CMA helpers allocate non-coherent (i.e., cached) backing storage
with dma_alloc_noncoherent(), but release it with dma_free_wc(). Fix this
with a call to dma_free_noncoherent(). Writecombining storage is still
released with dma_free_wc().

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Fixes: cf8ccbc72d61 ("drm: Add support for GEM buffers backed by non-coherent memory")
Acked-by: Paul Cercueil <paul@crapouillou.net>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Maxime Ripard <mripard@kernel.org>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: dri-devel@lists.freedesktop.org
Cc: <stable@vger.kernel.org> # v5.14+
Link: https://patchwork.freedesktop.org/patch/msgid/20210708175146.10618-1-tzimmermann@suse.de

+7 -2
+7 -2
drivers/gpu/drm/drm_gem_cma_helper.c
··· 210 210 dma_buf_vunmap(gem_obj->import_attach->dmabuf, &map); 211 211 drm_prime_gem_destroy(gem_obj, cma_obj->sgt); 212 212 } else if (cma_obj->vaddr) { 213 - dma_free_wc(gem_obj->dev->dev, cma_obj->base.size, 214 - cma_obj->vaddr, cma_obj->paddr); 213 + if (cma_obj->map_noncoherent) 214 + dma_free_noncoherent(gem_obj->dev->dev, cma_obj->base.size, 215 + cma_obj->vaddr, cma_obj->paddr, 216 + DMA_TO_DEVICE); 217 + else 218 + dma_free_wc(gem_obj->dev->dev, cma_obj->base.size, 219 + cma_obj->vaddr, cma_obj->paddr); 215 220 } 216 221 217 222 drm_gem_object_release(gem_obj);