From patchwork Tue Mar 22 10:25:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Luis Henriques X-Patchwork-Id: 600588 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3qTprg68MMz9s5Q; Tue, 22 Mar 2016 21:31:15 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1aiJai-0000w2-K8; Tue, 22 Mar 2016 10:31:12 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1aiJUm-0006XP-69 for kernel-team@lists.ubuntu.com; Tue, 22 Mar 2016 10:25:04 +0000 Received: from av-217-129-130-179.netvisao.pt ([217.129.130.179] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1aiJUl-0008AT-BH; Tue, 22 Mar 2016 10:25:03 +0000 From: Luis Henriques To: Luis Henriques Subject: [3.16.y-ckt stable] Patch "Revert "drm/radeon: hold reference to fences in radeon_sa_bo_new"" has been added to the 3.16.y-ckt tree Date: Tue, 22 Mar 2016 10:25:02 +0000 Message-Id: <1458642302-32595-1-git-send-email-luis.henriques@canonical.com> MIME-Version: 1.0 X-Extended-Stable: 3.16 Cc: Erik Andersen , =?UTF-8?q?Christian=20K=C3=B6nig?= , =?UTF-8?q?Nicolai=20H=C3=A4hnle?= , kernel-team@lists.ubuntu.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com This is a note to let you know that I have just added a patch titled Revert "drm/radeon: hold reference to fences in radeon_sa_bo_new" to the linux-3.16.y-queue branch of the 3.16.y-ckt extended stable tree which can be found at: http://kernel.ubuntu.com/git/ubuntu/linux.git/log/?h=linux-3.16.y-queue This patch is scheduled to be released in version 3.16.7-ckt26. If you, or anyone else, feels it should not be added to this tree, please reply to this email. For more information about the 3.16.y-ckt tree, see https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable Thanks. -Luis ---8<------------------------------------------------------------ From 570300978c079a3f64b9957291d119cca865480a Mon Sep 17 00:00:00 2001 From: Luis Henriques Date: Wed, 9 Mar 2016 13:58:27 +0000 Subject: Revert "drm/radeon: hold reference to fences in radeon_sa_bo_new" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 73187980dfefe5198aadcfdf0a377e461eed2bfa, which was commit f6ff4f67cdf8455d0a4226eeeaf5af17c37d05eb upstream. This patch was triggering a Oops in stable kernel 3.10.99. Christian agrees that the patch is correct but "assumes that radeon_fence_unref() can safely take NULL as the fence which is not the case for older kernels." Reported-by: Erik Andersen Acked-by: Christian König Cc: Nicolai Hähnle Signed-off-by: Luis Henriques --- drivers/gpu/drm/radeon/radeon_sa.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_sa.c b/drivers/gpu/drm/radeon/radeon_sa.c index 15fd57296081..adcf3e2f07da 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) {