From: Greg Kroah-Hartman Date: Mon, 18 Apr 2016 01:31:57 +0000 (+0900) Subject: Revert bad backport of "drm/radeon: hold reference to fences in radeon_sa_bo_new" X-Git-Tag: v3.14.67~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ac960dc06ca2d618c40206d8839180a5703552f;p=thirdparty%2Fkernel%2Fstable.git Revert bad backport of "drm/radeon: hold reference to fences in radeon_sa_bo_new" This reverts commit 50353e6f86eb2ac46ffe3cc0b9f9a11ddc8a9410, which is commit f6ff4f67cdf8455d0a4226eeeaf5af17c37d05eb upstream, as it was backported to the 3.14-stable tree incorrectly. A correct fix will happen next. Reported-by: Nicolai Hähnle Cc: Christian König Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/gpu/drm/radeon/radeon_sa.c b/drivers/gpu/drm/radeon/radeon_sa.c index a1d6842665493..c0625805cdd76 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) {