diff options
| author | Nicolai Hähnle <nicolai.haehnle@amd.com> | 2016-02-05 14:35:53 -0500 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2016-03-04 10:18:40 -0500 |
| commit | 647e40c69aff11bf5cf73a92d15a91439fe38ae9 (patch) | |
| tree | a0d8fe8e80fc5c974e10665b1fa791fd557481ac | |
| parent | 97e8007ccee791c1eddb3822c1597979cbe8a45e (diff) | |
| download | lwn-647e40c69aff11bf5cf73a92d15a91439fe38ae9.tar.gz lwn-647e40c69aff11bf5cf73a92d15a91439fe38ae9.zip | |
drm/radeon: hold reference to fences in radeon_sa_bo_new
[ 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 <nicolai.haehnle@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Cc: stable@vger.kernel.org
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_sa.c | 5 |
1 files changed, 5 insertions, 0 deletions
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) { |