| From 17b11f71795abdce46f62a808f906857e525cea8 Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com> |
| Date: Mon, 21 Jun 2021 13:36:35 +0200 |
| Subject: drm/nouveau: wait for moving fence after pinning v2 |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Christian König <christian.koenig@amd.com> |
| |
| commit 17b11f71795abdce46f62a808f906857e525cea8 upstream. |
| |
| We actually need to wait for the moving fence after pinning |
| the BO to make sure that the pin is completed. |
| |
| v2: grab the lock while waiting |
| |
| Signed-off-by: Christian König <christian.koenig@amd.com> |
| Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> |
| References: https://lore.kernel.org/dri-devel/20210621151758.2347474-1-daniel.vetter@ffwll.ch/ |
| CC: stable@kernel.org |
| Link: https://patchwork.freedesktop.org/patch/msgid/20210622114506.106349-1-christian.koenig@amd.com |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/gpu/drm/nouveau/nouveau_prime.c | 17 ++++++++++++++++- |
| 1 file changed, 16 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/gpu/drm/nouveau/nouveau_prime.c |
| +++ b/drivers/gpu/drm/nouveau/nouveau_prime.c |
| @@ -111,7 +111,22 @@ int nouveau_gem_prime_pin(struct drm_gem |
| if (ret) |
| return -EINVAL; |
| |
| - return 0; |
| + ret = ttm_bo_reserve(&nvbo->bo, false, false, NULL); |
| + if (ret) |
| + goto error; |
| + |
| + if (nvbo->bo.moving) |
| + ret = dma_fence_wait(nvbo->bo.moving, true); |
| + |
| + ttm_bo_unreserve(&nvbo->bo); |
| + if (ret) |
| + goto error; |
| + |
| + return ret; |
| + |
| +error: |
| + nouveau_bo_unpin(nvbo); |
| + return ret; |
| } |
| |
| void nouveau_gem_prime_unpin(struct drm_gem_object *obj) |
