From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 36C8FC433DF for ; Mon, 29 Jun 2020 19:53:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0D79F20674 for ; Mon, 29 Jun 2020 19:53:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593460390; bh=2QGbqlj29PbLRqTPspr6W19awiuDaSEDafDJQiGb6l4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ECPhPlBnQhcfHawYGzsLt6T842oxY3WjN61GKhSCnY2MCsJIicG/BsfWvZ+ISE4yy 5X+FFjV6j7ZXpf4Eep+Eh+NvWgmNcUURB4xmUkFERG3aFX45ZIo8OVIanDsbtivMlt yUnkEafLB4u9Q8VzKj/EZoX9Kzae4fsoaetSsg9k= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729879AbgF2TxG (ORCPT ); Mon, 29 Jun 2020 15:53:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:47652 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387686AbgF2Tk0 (ORCPT ); Mon, 29 Jun 2020 15:40:26 -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 D4909251BB; Mon, 29 Jun 2020 15:28:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593444491; bh=2QGbqlj29PbLRqTPspr6W19awiuDaSEDafDJQiGb6l4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PJ0bHke7A8LWGiaFagGECEWBWw9/bbLGwD2cIDT/SriobjTj34UHvuRyBk/fCxqNh 7cq6Win5oyG29mY6IyPJarBJaFTTlN73JtoNGaMTdPAhRx2MuAxJV0rMk6+IV0xTh4 PUi4J1mp3IFO7qYbtVqiCBurO8Vqiy/61fuXZ2Mw= 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.4 168/178] drm/amdgpu: add fw release for sdma v5_0 Date: Mon, 29 Jun 2020 11:25:13 -0400 Message-Id: <20200629152523.2494198-169-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200629152523.2494198-1-sashal@kernel.org> References: <20200629152523.2494198-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.50-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-5.4.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 5.4.50-rc1 X-KernelTest-Deadline: 2020-07-01T15:25+00:00 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 bd715012185c6..23fc16dc92b4d 100644 --- a/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c @@ -1273,8 +1273,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