Commit 40df18b4 authored by Nicolai Hähnle's avatar Nicolai Hähnle Committed by Jiri Slaby

drm/radeon: hold reference to fences in radeon_sa_bo_new

commit f6ff4f67 upstream.

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: default avatarNicolai Hähnle <nicolai.haehnle@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
parent e2f0c800
...@@ -349,8 +349,13 @@ int radeon_sa_bo_new(struct radeon_device *rdev, ...@@ -349,8 +349,13 @@ int radeon_sa_bo_new(struct radeon_device *rdev,
/* see if we can skip over some allocations */ /* see if we can skip over some allocations */
} while (radeon_sa_bo_next_hole(sa_manager, fences, tries)); } 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); spin_unlock(&sa_manager->wq.lock);
r = radeon_fence_wait_any(rdev, fences, false); 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); spin_lock(&sa_manager->wq.lock);
/* if we have nothing to wait for block */ /* if we have nothing to wait for block */
if (r == -ENOENT && block) { if (r == -ENOENT && block) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment