FAILED: patch "[PATCH] drm/nouveau: fix dma syncing warning with debugging on." failed to apply to 5.10-stable tree
Subsystems (4)
[email protected]
maintainerThe patch below does not apply to the 5.10-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From f295c8cfec833c2707ff1512da10d65386dde7af Mon Sep 17 00:00:00 2001
From: Dave Airlie <[email protected]>
Date: Mon, 1 Feb 2021 10:56:32 +1000
Subject: [PATCH] drm/nouveau: fix dma syncing warning with debugging on.
Since I wrote the below patch if you run a debug kernel you can a
dma debug warning like:
nouveau 0000:1f:00.0: DMA-API: device driver tries to sync DMA memory it has not allocated [device address=0x000000016e012000] [size=4096 bytes]
The old nouveau code wasn't consolidate the pages like the ttm code, but the dma-debug expects the sync code to give it the same base/range pairs as the allocator.
Fix the nouveau sync code to consolidate pages before calling the sync code.
drivers/gpu/drm/nouveau/nouveau_bo.c +29 -6
@@ -547,7 +547,7 @@ nouveau_bo_sync_for_device(struct nouveau_bo *nvbo) {struct nouveau_drm *drm =nouveau_bdev (nvbo->bo.bdev);struct ttm_tt *ttm_dma = (struct ttm_tt *)nvbo->bo.ttm; -int i; +int i, j;if (!ttm_dma)return ;
@@ -556,10 +556,21 @@ nouveau_bo_sync_for_device(struct nouveau_bo *nvbo)if (nvbo->force_coherent)return ; -for (i =0 ; i < ttm_dma->num_pages; i++) +for (i =0 ; i < ttm_dma->num_pages; ++i) { +struct page *p = ttm_dma->pages[i]; +size_t num_pages =1 ; + +for (j = i +1 ; j < ttm_dma->num_pages; ++j) { +if (++p != ttm_dma->pages[j]) +break ; + + ++num_pages; + }dma_sync_single_for_device (drm->dev->dev, ttm_dma->dma_address[i], -PAGE_SIZE ,DMA_TO_DEVICE ); + num_pages *PAGE_SIZE ,DMA_TO_DEVICE ); + i += num_pages; + } }void
@@ -567,7 +578,7 @@ nouveau_bo_sync_for_cpu(struct nouveau_bo *nvbo) {struct nouveau_drm *drm =nouveau_bdev (nvbo->bo.bdev);struct ttm_tt *ttm_dma = (struct ttm_tt *)nvbo->bo.ttm; -int i; +int i, j;if (!ttm_dma)return ;
@@ -576,9 +587,21 @@ nouveau_bo_sync_for_cpu(struct nouveau_bo *nvbo)if (nvbo->force_coherent)return ; -for (i =0 ; i < ttm_dma->num_pages; i++) +for (i =0 ; i < ttm_dma->num_pages; ++i) { +struct page *p = ttm_dma->pages[i]; +size_t num_pages =1 ; + +for (j = i +1 ; j < ttm_dma->num_pages; ++j) { +if (++p != ttm_dma->pages[j]) +break ; + + ++num_pages; + } +dma_sync_single_for_cpu (drm->dev->dev, ttm_dma->dma_address[i], -PAGE_SIZE ,DMA_FROM_DEVICE ); + num_pages *PAGE_SIZE ,DMA_FROM_DEVICE ); + i += num_pages; + } }void nouveau_bo_add_io_reserve_lru (struct ttm_buffer_object *bo)