]> git.hungrycats.org Git - linux/commitdiff
Revert "drm/radeon: hold reference to fences in radeon_sa_bo_new"
authorJiri Slaby <jslaby@suse.cz>
Mon, 14 Mar 2016 12:33:30 +0000 (13:33 +0100)
committerJiri Slaby <jslaby@suse.cz>
Mon, 14 Mar 2016 12:34:17 +0000 (13:34 +0100)
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>
drivers/gpu/drm/radeon/radeon_sa.c

index bb166849aa6e876e012eaabb801a512945cb4424..f0bac68254b79a5dd31cfdc14ce80a98bca91065 100644 (file)
@@ -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) {