From: Dave Airlie airlied@redhat.com
The index variable should only be increased in one place.
Noticed this while trying to track down another oops.
Fixes: f295c8cfec83 ("drm/nouveau: fix dma syncing warning with debugging on.") Signed-off-by: Dave Airlie airlied@redhat.com --- drivers/gpu/drm/nouveau/nouveau_bo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c index 2375711877cf..4f693843def5 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bo.c +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c @@ -556,7 +556,7 @@ 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;) { struct page *p = ttm_dma->pages[i]; size_t num_pages = 1;
@@ -587,7 +587,7 @@ 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;) { struct page *p = ttm_dma->pages[i]; size_t num_pages = 1;
-----Original Message----- From: dri-devel dri-devel-bounces@lists.freedesktop.org On Behalf Of Dave Airlie Sent: Sunday, March 7, 2021 8:49 PM To: dri-devel@lists.freedesktop.org Cc: skeggsb@gmail.com Subject: [PATCH] drm/nouveau: fix dma syncing for loops
From: Dave Airlie airlied@redhat.com
The index variable should only be increased in one place.
Noticed this while trying to track down another oops.
Fixes: f295c8cfec83 ("drm/nouveau: fix dma syncing warning with debugging on.") Signed-off-by: Dave Airlie airlied@redhat.com
drivers/gpu/drm/nouveau/nouveau_bo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c index 2375711877cf..4f693843def5 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bo.c +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c @@ -556,7 +556,7 @@ 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;) {
This took a bit to see how the increment worked.
Would calling it out with a comment be out of line?
With or without the comment:
Reviewed-by: Michael J. Ruhl michael.j.ruhl@intel.com
M
struct page *p = ttm_dma->pages[i]; size_t num_pages = 1;@@ -587,7 +587,7 @@ 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;) { struct page *p = ttm_dma->pages[i]; size_t num_pages = 1;
-- 2.27.0
dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
dri-devel@lists.freedesktop.org
-
Dave Airlie -
Ruhl, Michael J