On Tue, Jun 22, 2021 at 1:45 PM Christian König ckoenig.leichtzumerken@gmail.com wrote:
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 References: https://lore.kernel.org/dri-devel/20210621151758.2347474-1-daniel.vetter@ffw... CC: stable@kernel.org
Reviewed-by: Daniel Vetter daniel.vetter@ffwll.ch
drivers/gpu/drm/nouveau/nouveau_prime.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/nouveau/nouveau_prime.c b/drivers/gpu/drm/nouveau/nouveau_prime.c index 347488685f74..60019d0532fc 100644 --- a/drivers/gpu/drm/nouveau/nouveau_prime.c +++ b/drivers/gpu/drm/nouveau/nouveau_prime.c @@ -93,7 +93,22 @@ int nouveau_gem_prime_pin(struct drm_gem_object *obj) 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)
2.25.1