From: Nicolai Hähnle Date: Fri, 5 Feb 2016 19:35:53 +0000 (-0500) Subject: drm/radeon: hold reference to fences in radeon_sa_bo_new X-Git-Tag: MMI-PSA29.97-13-9~8507^2~1^2~1 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f6ff4f67cdf8455d0a4226eeeaf5af17c37d05eb;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git drm/radeon: hold reference to fences in radeon_sa_bo_new An arbitrary amount of time can pass between spin_unlock and radeon_fence_wait_any, so we need to ensure that nobody frees the fences from under us. Based on the analogous fix for amdgpu. Signed-off-by: Nicolai Hähnle Reviewed-by: Christian König Cc: stable@vger.kernel.org --- diff --git a/drivers/gpu/drm/radeon/radeon_sa.c b/drivers/gpu/drm/radeon/radeon_sa.c index c507896aca45..197b157b73d0 100644 --- a/drivers/gpu/drm/radeon/radeon_sa.c +++ b/drivers/gpu/drm/radeon/radeon_sa.c @@ -349,8 +349,13 @@ int radeon_sa_bo_new(struct radeon_device *rdev, /* see if we can skip over some allocations */ } while (radeon_sa_bo_next_hole(sa_manager, fences, tries)); + for (i = 0; i < RADEON_NUM_RINGS; ++i) + radeon_fence_ref(fences[i]); + spin_unlock(&sa_manager->wq.lock); r = radeon_fence_wait_any(rdev, fences, false); + for (i = 0; i < RADEON_NUM_RINGS; ++i) + radeon_fence_unref(&fences[i]); spin_lock(&sa_manager->wq.lock); /* if we have nothing to wait for block */ if (r == -ENOENT) {