From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1D52E664D2; Tue, 13 Feb 2024 00:22:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707783728; cv=none; b=R7sGNq0Mh+9bdPTJPIW820pdsBBmFFvFUw4IxzToy2KVlExogZCFumGi4eDeAsipPq2ai2KX04T1j7rj5XdmxKxD0zA9j6O0PpiH8cLUs92WdjwHfp75SO+/CfxgB4ZkaI1yzorxfrSm7H93ZfwtpXlDulwUmQhIFcLieENzADw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707783728; c=relaxed/simple; bh=Jj/+vwAaPt9NGnFj9Q4X47VIh4kJvEAyspH8LXVvI68=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HPCIZgBxTIYOhmj384tFT/ru7SMaQ6+eCT8xQT6cSKKVeOm+8cjKun76+DDnKsiRxM+6CSbLQOVGBNTWiQs1zKyvDaMUZrHy2pxFk2ODpHbMEJsABUttahVKCJ1FZK6gpCSvUOlDa5xfRNtxKy+dY/uegnfENAb4FG0VAOjVCrc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=QMCaj4aw; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="QMCaj4aw" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E5C46C433F1; Tue, 13 Feb 2024 00:22:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1707783727; bh=Jj/+vwAaPt9NGnFj9Q4X47VIh4kJvEAyspH8LXVvI68=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QMCaj4awkB+6vDMAeYvRLgTv+2fv08kKFjC4RkO/nWcGQa5tGuneacIwlMh2QBzdK d19biprhDjAMeDA3OOcLjn0JKno68HiYOevupS58bRom+ybmnXHonHkcxrBfLtyqwp UsNdyF0hA9XEFMpLylXuldtXqw3gb74wzR2BXqQE0GHjF6wlxscT+q7pU4cGLaUkBy I3CSf8dtIQDvkOHsA3gTvDkCDLO21hxIvp0i6ewWruwg8eYVriLPCGqw5WhMDZVbBX qVmz2VE6ZrjRTHFTjeVL84FzE+wLQarvL/M4xo/J4EnKNzK4vTv6FJbOac/Tt/KLAq 670nhj7CWn9Cg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Prike Liang , Alex Deucher , Sasha Levin , christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@gmail.com, daniel@ffwll.ch, Hawking.Zhang@amd.com, lijo.lazar@amd.com, le.ma@amd.com, James.Zhu@amd.com, shane.xiao@amd.com, sonny.jiang@amd.com, Likun.Gao@amd.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 6.6 44/51] drm/amdgpu: reset gpu for s3 suspend abort case Date: Mon, 12 Feb 2024 19:20:21 -0500 Message-ID: <20240213002052.670571-44-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240213002052.670571-1-sashal@kernel.org> References: <20240213002052.670571-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6.16 Content-Transfer-Encoding: 8bit From: Prike Liang [ Upstream commit 6ef82ac664bb9568ca3956e0d9c9c478e25077ff ] In the s3 suspend abort case some type of gfx9 power rail not turn off from FCH side and this will put the GPU in an unknown power status, so let's reset the gpu to a known good power state before reinitialize gpu device. Signed-off-by: Prike Liang Acked-by: Alex Deucher Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/soc15.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c index 3667f9a54841..2a7c606d1d19 100644 --- a/drivers/gpu/drm/amd/amdgpu/soc15.c +++ b/drivers/gpu/drm/amd/amdgpu/soc15.c @@ -1296,10 +1296,32 @@ static int soc15_common_suspend(void *handle) return soc15_common_hw_fini(adev); } +static bool soc15_need_reset_on_resume(struct amdgpu_device *adev) +{ + u32 sol_reg; + + sol_reg = RREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_81); + + /* Will reset for the following suspend abort cases. + * 1) Only reset limit on APU side, dGPU hasn't checked yet. + * 2) S3 suspend abort and TOS already launched. + */ + if (adev->flags & AMD_IS_APU && adev->in_s3 && + !adev->suspend_complete && + sol_reg) + return true; + + return false; +} + static int soc15_common_resume(void *handle) { struct amdgpu_device *adev = (struct amdgpu_device *)handle; + if (soc15_need_reset_on_resume(adev)) { + dev_info(adev->dev, "S3 suspend abort case, let's reset ASIC.\n"); + soc15_asic_reset(adev); + } return soc15_common_hw_init(adev); } -- 2.43.0