diff options
| author | Jiri Slaby <jslaby@suse.cz> | 2016-03-14 13:33:30 +0100 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2016-03-14 13:34:17 +0100 |
| commit | a98603c5b956c44a37243d2d01e6c4b024201bba (patch) | |
| tree | 600738e94423805d3b5b1c87430498b3d763f487 | |
| parent | 1cfdd759db4f056477b72357df2f95786a52b541 (diff) | |
| download | lwn-a98603c5b956c44a37243d2d01e6c4b024201bba.tar.gz lwn-a98603c5b956c44a37243d2d01e6c4b024201bba.zip | |
Revert "drm/radeon: hold reference to fences in radeon_sa_bo_new"
This reverts commit 40df18b49e7fe4ec9ab93f68c33661ee291149bd, commit
f6ff4f67cdf8455d0a4226eeeaf5af17c37d05eb upstream.
It causes oopses:
BUG: unable to handle kernel NULL pointer dereference at 0000000000000008
IP: [<ffffffffa010345d>] radeon_fence_ref+0xd/0x50 [radeon]
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Nicolai Hähnle <nicolai.haehnle@amd.com>
Cc: Christian König <christian.koenig@amd.com>
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_sa.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_sa.c b/drivers/gpu/drm/radeon/radeon_sa.c index bb166849aa6e..f0bac68254b7 100644 --- a/drivers/gpu/drm/radeon/radeon_sa.c +++ b/drivers/gpu/drm/radeon/radeon_sa.c @@ -349,13 +349,8 @@ 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 && block) { |