From patchwork Tue May 24 22:31:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 9134323 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id CD82160221 for ; Tue, 24 May 2016 22:31:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C380E28176 for ; Tue, 24 May 2016 22:31:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B86252822B; Tue, 24 May 2016 22:31:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_WEB, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2AA4F28176 for ; Tue, 24 May 2016 22:31:40 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6AD4A6E559; Tue, 24 May 2016 22:31:38 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-io0-x241.google.com (mail-io0-x241.google.com [IPv6:2607:f8b0:4001:c06::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 02F9D6E30A for ; Tue, 24 May 2016 22:31:25 +0000 (UTC) Received: by mail-io0-x241.google.com with SMTP id s67so3441232ios.0 for ; Tue, 24 May 2016 15:31:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=O2opjUNMaEZSN6K8+W3wkoyRWWkZAPccXszA06OX8cs=; b=BGR2gdoyAKlnI43rAfS3+ItXWRE3yp3Rjbq2URLx3/DCSP/fUvm9xwh1g9PhCIW/Fg RcjUkwR/pFcwTvDzvq2D/HqbtOyLX355haBa+3YmunHWototNamhwzaEwcL1G6BAMeOC C83OOofxIfpA2biwq5lWWM1mCaugjjCKfS3pfLHRPslVlnTosnyjLTpyIilGJeCECINh 4En6EOE/Qd2xGgYJxUDmRhgdu7jvfaQQsSjFQtKAGd+2y+/VzO6vleWXESg05yK1u64a czEtwzlGi3whqn2ndOhT/WSqYrRizrMEe5DB7OJLzFAJcSve8BOLkirWij5lCLbK05RP carA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=O2opjUNMaEZSN6K8+W3wkoyRWWkZAPccXszA06OX8cs=; b=aUM6WHSIH/qsZzTGPxd3s0pqxdNssjC452FqXmdzDOPl1bBr/Y98mxPNwCoa521DMJ acZnU0NsjHnERvRmMDxwWFijQ6Fv7+Dqqnmuv4U2l6Oc/9lD28+Afn6+Jg7QKgKwu9Wb USiEbZfcRppB0wOMEfF7WWLvT/IzbMUra8HPHiBFuecO3Q2/JWZsXnVODztQPE1nXe+n jT4e7220ZaKfZi61EknsyyN+sd1o2vQVJa9C8qeDCnpw2XJEwG6K5bZyhheNXLdt2gCG M5QUD3yF5LN+Bnxww8/7/MCp0/FIbiZr5mw4t5lafYafJ48tY3sCOUwd2YUJtoFLeWIe +IMA== X-Gm-Message-State: ALyK8tJ2bWiSTlawDQBVX7rjsoQEHM0JGPJjHT/IirPgjW+f+SggjwPItYQ4O36pMNnAEw== X-Received: by 10.107.173.158 with SMTP id m30mr1069633ioo.131.1464129083970; Tue, 24 May 2016 15:31:23 -0700 (PDT) Received: from cm.amd.com ([165.204.55.251]) by smtp.gmail.com with ESMTPSA id u21sm7658900itc.1.2016.05.24.15.31.23 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 24 May 2016 15:31:23 -0700 (PDT) From: Alex Deucher X-Google-Original-From: Alex Deucher To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm/amdgpu: fix bug in fence driver fini Date: Tue, 24 May 2016 18:31:13 -0400 Message-Id: <1464129073-15272-2-git-send-email-alexander.deucher@amd.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1464129073-15272-1-git-send-email-alexander.deucher@amd.com> References: <1464129073-15272-1-git-send-email-alexander.deucher@amd.com> MIME-Version: 1.0 Cc: Alex Deucher , Monk Liu X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Monk Liu Using wrong counter for walking fences. Fixes a crash when unloading the driver. Signed-off-by: Monk Liu Reviewed-by: Christian König Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c index 7eb2fca8..d155876 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c @@ -443,7 +443,7 @@ void amdgpu_fence_driver_fini(struct amdgpu_device *adev) amd_sched_fini(&ring->sched); del_timer_sync(&ring->fence_drv.fallback_timer); for (j = 0; j <= ring->fence_drv.num_fences_mask; ++j) - fence_put(ring->fence_drv.fences[i]); + fence_put(ring->fence_drv.fences[j]); kfree(ring->fence_drv.fences); ring->fence_drv.initialized = false; }