Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp3081688ybt; Mon, 29 Jun 2020 14:52:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy9Us0sTL9K9lR/k7iE64naAiDf6i0XMaLSQN4dyVa5AulaV26Iv293UD1+T92z3jC9/v6w X-Received: by 2002:aa7:d043:: with SMTP id n3mr20559048edo.102.1593467528712; Mon, 29 Jun 2020 14:52:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593467528; cv=none; d=google.com; s=arc-20160816; b=CgUKY8ylXfuNCl7M/LllQb108F141sQk4pYZxH4u0Uqaix7Oewx50CoXBUKOKkWv4Y hPOmIO3HY1KR3RmRivW7OTIkd3fQNuc5ttf1RVJmRtcMWuCohhbmntjGESAVxfTuLqJB gbHuI/TqSkou7MC6zJ53DGzqHloHrxIUosjj7WOp/JVmNzNQAyE0osSFL5TVOM4dnWIL lrdyy5TuksnA84hKmwEZb2NQbMvBxY7mbtAHOdVWoWhDUyHApoVwC5rxKEZMkCLiIIpj LqLy4hyOAD05Fi3nF3EB+fQRzxCqK44wRhkJtfWRPMRuAkWkWzlNPm1ASL4Dr+gyBXgc gsJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=qtBeou65L/o+gzVz2GHrqLaxEqsM7iq+t4ZOPRzk4b4=; b=LY+hHnDLvcyzHxBKcRlczyKgfapT3FKAWRJofgOZORoP2rDYNuTHvcDIjnttnOLTFr 43Fwp73XwZOTBOvJbiaBBAyG7GhfsV518j6vJhxYto6bIviCpHg3djhUyLzvnvN3UMwo M8TO13KMBsniMAVVVHe37+v1mo5uJhcd7NjCzPI7ZfDLmpOrwHpiF7FeTJcew/b+novv 197Qt0SjgyLB99j6erTcWVmxPc8ZElHIAo22waDNdaVVxatU6MpliiZQQZe8RYTVLfyq AaJV0Rh3kvo+gzoIjuWFQdkiZYKmD6B8ExuzpIXyVn5kCV3ke2HZ2E1OH63XHCyCPjMQ 2eqg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=gGyNNCvz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id cc13si479990edb.297.2020.06.29.14.51.46; Mon, 29 Jun 2020 14:52:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=gGyNNCvz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404319AbgF2Vsp (ORCPT + 99 others); Mon, 29 Jun 2020 17:48:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:56786 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726715AbgF2Sfm (ORCPT ); Mon, 29 Jun 2020 14:35:42 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A4406247DA; Mon, 29 Jun 2020 15:22:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593444144; bh=brRajcykVy9yW26Z2PG9o1IhYOjKjuI0mu4oVX9mPHU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gGyNNCvz0ezcM+nOeIZ9k7ON8ZRg+/wFaF16KfSV+xgDEdw+lOLecZfTn60bN6w4c CElDJS60/UFhgJcjik4pw63D12sXe3Gg77MuwUQAJQ2XYs+zAPhUWTlPm4upvjGrD6 70YwwUAie/14cC9g/mFV24IKYsL0sDv5zKx6mQsc= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Wenhui Sheng , Hawking Zhang , Alex Deucher , Greg Kroah-Hartman Subject: [PATCH 5.7 249/265] drm/amdgpu: add fw release for sdma v5_0 Date: Mon, 29 Jun 2020 11:18:02 -0400 Message-Id: <20200629151818.2493727-250-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200629151818.2493727-1-sashal@kernel.org> References: <20200629151818.2493727-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.7.7-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-5.7.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 5.7.7-rc1 X-KernelTest-Deadline: 2020-07-01T15:14+00:00 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Wenhui Sheng commit edfaf6fa73f15568d4337f208b2333f647c35810 upstream. sdma fw isn't released when module exit Reviewed-by: Hawking Zhang Signed-off-by: Wenhui Sheng Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c index d2840c2f62865..1dc57079933ce 100644 --- a/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c @@ -1261,8 +1261,12 @@ static int sdma_v5_0_sw_fini(void *handle) struct amdgpu_device *adev = (struct amdgpu_device *)handle; int i; - for (i = 0; i < adev->sdma.num_instances; i++) + for (i = 0; i < adev->sdma.num_instances; i++) { + if (adev->sdma.instance[i].fw != NULL) + release_firmware(adev->sdma.instance[i].fw); + amdgpu_ring_fini(&adev->sdma.instance[i].ring); + } return 0; } -- 2.25.1