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: v4.1.12-92~150^2~207 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=bc6280558bfe516dd3df12c4529a1a6ac052b4bb;p=users%2Fjedix%2Flinux-maple.git drm/radeon: hold reference to fences in radeon_sa_bo_new Orabug: 23330856 [ Upstream commit f6ff4f67cdf8455d0a4226eeeaf5af17c37d05eb ] 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 Signed-off-by: Sasha Levin (cherry picked from commit 7071cc9b4f9d4fd6dee20bb8dd760a8f9e1ceec7) Signed-off-by: Dan Duval --- diff --git a/drivers/gpu/drm/radeon/radeon_sa.c b/drivers/gpu/drm/radeon/radeon_sa.c index c507896aca45a..197b157b73d09 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) {