From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Nicolai=20H=C3=A4hnle?= Subject: [PATCH] drm/radeon: hold reference to fences in radeon_sa_bo_new (3.17 and older) Date: Tue, 15 Mar 2016 12:56:45 -0500 Message-ID: <1458064605-668-1-git-send-email-nhaehnle@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Sender: stable-owner@vger.kernel.org To: dri-devel@lists.freedesktop.org Cc: =?UTF-8?q?Nicolai=20H=C3=A4hnle?= , stable@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org =46rom: Nicolai H=C3=A4hnle [Backport of upstream commit f6ff4f67cdf8455d0a4226eeeaf5af17c37d05eb, = with an additional NULL pointer guard that is required for kernels 3.17 and= older. To be precise, any kernel that does *not* have commit 954605ca3 "drm/r= adeon: use common fence implementation for fences, v4" requires this addition= al NULL pointer guard.] 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=C3=A4hnle Reviewed-by: Christian K=C3=B6nig (v1 + fix) Tested-by: Lutz Euler Cc: stable@vger.kernel.org --- drivers/gpu/drm/radeon/radeon_sa.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/gpu/drm/radeon/radeon_sa.c b/drivers/gpu/drm/radeo= n/radeon_sa.c index c507896..7d11901 100644 --- a/drivers/gpu/drm/radeon/radeon_sa.c +++ b/drivers/gpu/drm/radeon/radeon_sa.c @@ -349,8 +349,15 @@ 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)); =20 + for (i =3D 0; i < RADEON_NUM_RINGS; ++i) { + if (fences[i]) + radeon_fence_ref(fences[i]); + } + spin_unlock(&sa_manager->wq.lock); r =3D radeon_fence_wait_any(rdev, fences, false); + for (i =3D 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 =3D=3D -ENOENT) { --=20 2.5.0