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 DE419839E2; Tue, 13 Feb 2024 00:23:19 +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=1707783800; cv=none; b=MIjZa16YTy7vd05BV8sOLS8wD9OI4z/dDJUt7kp0C/YscaMj1RIIoZJs1mBoXlH3Jc0b/hfpdWsXrriQu9GMSZOz97a9Wq2te53LApFDrxLXxeKiK+mZK3VPRWEPwnXFSfDmFMLk4EjHRwnNldWqRNzHejkr4JuSlVB4PclHbBM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707783800; c=relaxed/simple; bh=6ryKZXEJRLnRj7J4B6wkp1zy0wxQlLN4XSjp4TGtT9c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fuvVYVKtNe1cHeTh6O5b2Q80/hueku7SagLPFX3P6gho0ZL+VrY7J5neFkjnkevLaBy4plKcrGt/BcVX9vxZ5MWEpvokmUTmM/1y8bYA2P0NKR0FZbFBcft2pHaeRCoQSyJU7AeqAvKvOa+2EuSSdR976szIyWmMAFqsTkNo95Y= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=PkO+sMXh; 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="PkO+sMXh" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6B300C433F1; Tue, 13 Feb 2024 00:23:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1707783799; bh=6ryKZXEJRLnRj7J4B6wkp1zy0wxQlLN4XSjp4TGtT9c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PkO+sMXhT3gwB0ctHjTumT5bHyyQggpTr5Kis49bBvOtwjQbWodH++7Mz3lYDNclF MhftX1/WzAIVBorsMSNi0mCbzKAEwzDZt2xQvIU2LomzMzAmSDaz+tpzRUOyR+7T1b JGKJc9xFUjcmmkCoNcyu7+IZJFvi9gKgJaDUlFpc08Eb3GrXjM5za/Ml2Fw9Ql2R67 mtpO688z1P/OHNF9tagvbdqyAsH17/t7cJ8tzjPybQaRKTJ8KY/mXy3Krim95ipwP8 SxIjts3DGOuSPDOkJ0zLR0ZLPTKeWlf7wEtN+etvMTHO2ur4icW7D3LxB01KetbR2p zRIrrvr7bdYlg== 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.1 25/28] drm/amdgpu: reset gpu for s3 suspend abort case Date: Mon, 12 Feb 2024 19:22:23 -0500 Message-ID: <20240213002235.671934-25-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240213002235.671934-1-sashal@kernel.org> References: <20240213002235.671934-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.1.77 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 811dd3ea6362..489c89465c78 100644 --- a/drivers/gpu/drm/amd/amdgpu/soc15.c +++ b/drivers/gpu/drm/amd/amdgpu/soc15.c @@ -1285,10 +1285,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