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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D0DD1C433EF for ; Mon, 15 Nov 2021 23:43:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BAC9161B2A for ; Mon, 15 Nov 2021 23:43:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1354129AbhKOXqZ (ORCPT ); Mon, 15 Nov 2021 18:46:25 -0500 Received: from mail.kernel.org ([198.145.29.99]:45224 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344144AbhKOTXb (ORCPT ); Mon, 15 Nov 2021 14:23:31 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 403DE63635; Mon, 15 Nov 2021 18:52:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1637002361; bh=lwgB7Hsu97ZdYn9eTEyjcN5LY0wG75CbCiqtQUE982c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ysNKmyDCiDd0aJhiTcrtrNdnjNKK2zUDB6SIREoOzOcNIkQHcXc2+zkLLsSoYlHbq a2Ejsv2UWcG+f2I1k7xqc8Uy56qz0rTKLog/Yfv+I0ath84eYMGapwyLPEHStcPKbw cU6B7p+Vkpd/TrY4IbK3yCmo4/vHbvGxz7Yypqyo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lang Yu , Andrey Grodzovsky , Alex Deucher , Sasha Levin Subject: [PATCH 5.15 538/917] drm/amdgpu: fix a potential memory leak in amdgpu_device_fini_sw() Date: Mon, 15 Nov 2021 18:00:33 +0100 Message-Id: <20211115165447.001444831@linuxfoundation.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211115165428.722074685@linuxfoundation.org> References: <20211115165428.722074685@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Lang Yu [ Upstream commit a5c5d8d50ecf5874be90a76e1557279ff8a30c9e ] amdgpu_fence_driver_sw_fini() should be executed before amdgpu_device_ip_fini(), otherwise fence driver resource won't be properly freed as adev->rings have been tore down. Fixes: 72c8c97b1522 ("drm/amdgpu: Split amdgpu_device_fini into early and late") Signed-off-by: Lang Yu Reviewed-by: Andrey Grodzovsky Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index f7a98e9e68d88..c1e34aa5925b2 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -3877,8 +3877,8 @@ void amdgpu_device_fini_hw(struct amdgpu_device *adev) void amdgpu_device_fini_sw(struct amdgpu_device *adev) { - amdgpu_device_ip_fini(adev); amdgpu_fence_driver_sw_fini(adev); + amdgpu_device_ip_fini(adev); release_firmware(adev->firmware.gpu_info_fw); adev->firmware.gpu_info_fw = NULL; adev->accel_working = false; -- 2.33.0