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 8473454FA5; Tue, 27 Feb 2024 13:35:09 +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=1709040909; cv=none; b=T31gwL9boIFtNEPTmDaQhDaoARE282Mqrd8/QMsTFX7ihouPVFO5DwZaOEy24HedHcfReONMH9Z+qUEQmvNoFZ8Zfm+bXma0h/d8WPYgk7OvvjD8EazTH3P7CoAYuxwU1ac0to/qLhCHYH5YOwf6gw/dFTFS5k0AWkvFKe9w28M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709040909; c=relaxed/simple; bh=E60+FfmmVAqB20YgRd7+uldFrygUjWRgF3NcFgy1ZSk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mP9P3gZVttpIx+mspRiDmC/w4qBtScKD9QnyDk5IgU8gnp/SYk4DJilUcImAY2RTmRelMLiCjpQn+vQcAZrQRRYwjGTc2/WNj5LkHmLY6RxLfyt5hqHtrobVIln3z3KhO+mIBfiq3kMMzufRsV4gjUDloPUa874bW3OIU22DQ54= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=w8HbKPlP; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="w8HbKPlP" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0E87EC433C7; Tue, 27 Feb 2024 13:35:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1709040909; bh=E60+FfmmVAqB20YgRd7+uldFrygUjWRgF3NcFgy1ZSk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=w8HbKPlPEywQ1SSshL6sq622X/NvVTWQkZXEMHOQz3kd1PX4ZDEYnMEXwR8g/VxhW QwWTj+CngiATIA1JZTx5+tnVFnYAqSGehRcckR8hGQMxj8GS9oOm+nLugJo3jQNT2P qqKt7d+G+yY9J3i2n0BDbZ1iFliuKG1aJr92HoMA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Prike Liang , Alex Deucher , Sasha Levin Subject: [PATCH 6.7 125/334] drm/amdgpu: reset gpu for s3 suspend abort case Date: Tue, 27 Feb 2024 14:19:43 +0100 Message-ID: <20240227131634.501425427@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240227131630.636392135@linuxfoundation.org> References: <20240227131630.636392135@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.7-stable review patch. If anyone has any objections, please let me know. ------------------ 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 51342809af034..9b5af3f1383a7 100644 --- a/drivers/gpu/drm/amd/amdgpu/soc15.c +++ b/drivers/gpu/drm/amd/amdgpu/soc15.c @@ -1297,10 +1297,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