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 2B779757FB; Mon, 15 Apr 2024 14:31:44 +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=1713191504; cv=none; b=OylW2u6oqmDM5tefj37BvNNLaponIhTjT28lM89T1OLgdLkQ6HHDxWBEFvDZ4L0bk5hpIIPoEAnJS8C45RtP4mVAG2YG1ciqcllHYrhuPVDpkzoQlLYlVXUeKFGv2TKUOCnEqxA7J3PWQUrpywEl80tSNVKrWJISqdgy7eHeWis= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713191504; c=relaxed/simple; bh=7fl9qsbCDgyU55H96DJ4tAIRgSLCH8GC7iQP6wLhBE4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LBpWYNi8l2nQKd9p9SLlq05YOuQTS73QC/iA5Dzf4jr8sucwYpHRCt8jrAzu9I9yPqn7SLokyyQLu6SoKRJPaC601OR7px1CQHe/hv7hSeFE/jhhmhrIHd8mRUw36+sEi3rMQQ7L6fvlcsMv9cWHuBKfPKdI5xymQPgCa8aT9YQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=NXDr3e7a; 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="NXDr3e7a" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A8291C113CC; Mon, 15 Apr 2024 14:31:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1713191504; bh=7fl9qsbCDgyU55H96DJ4tAIRgSLCH8GC7iQP6wLhBE4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NXDr3e7aAPhThROfowIa1d80dRxHhPt5pdWCtedD8KisPSScSXyEt6nHr+WycwD2o Lbb9A+jemEekG8tbhbsJiuG2699Q+c1bqV+efTAjE9rHKD6Ke05HXCAV8Fm3/60xay UQGyPIVSZkAvb3udtMQhTLZ1KIBbrMycTwiPaWF0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Lijo Lazar , Alex Deucher , Yang Wang , Hawking Zhang Subject: [PATCH 6.8 163/172] drm/amdgpu: Reset dGPU if suspend got aborted Date: Mon, 15 Apr 2024 16:21:02 +0200 Message-ID: <20240415142005.304398474@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240415141959.976094777@linuxfoundation.org> References: <20240415141959.976094777@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.8-stable review patch. If anyone has any objections, please let me know. ------------------ From: Lijo Lazar commit 8b2be55f4d6c1099d7f629b0ed7535a5be788c83 upstream. For SOC21 ASICs, there is an issue in re-enabling PM features if a suspend got aborted. In such cases, reset the device during resume phase. This is a workaround till a proper solution is finalized. Signed-off-by: Lijo Lazar Reviewed-by: Alex Deucher Reviewed-by: Yang Wang Reviewed-by: Hawking Zhang Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/amdgpu/soc21.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) --- a/drivers/gpu/drm/amd/amdgpu/soc21.c +++ b/drivers/gpu/drm/amd/amdgpu/soc21.c @@ -832,10 +832,35 @@ static int soc21_common_suspend(void *ha return soc21_common_hw_fini(adev); } +static bool soc21_need_reset_on_resume(struct amdgpu_device *adev) +{ + u32 sol_reg1, sol_reg2; + + /* Will reset for the following suspend abort cases. + * 1) Only reset dGPU side. + * 2) S3 suspend got aborted and TOS is active. + */ + if (!(adev->flags & AMD_IS_APU) && adev->in_s3 && + !adev->suspend_complete) { + sol_reg1 = RREG32_SOC15(MP0, 0, regMP0_SMN_C2PMSG_81); + msleep(100); + sol_reg2 = RREG32_SOC15(MP0, 0, regMP0_SMN_C2PMSG_81); + + return (sol_reg1 != sol_reg2); + } + + return false; +} + static int soc21_common_resume(void *handle) { struct amdgpu_device *adev = (struct amdgpu_device *)handle; + if (soc21_need_reset_on_resume(adev)) { + dev_info(adev->dev, "S3 suspend aborted, resetting..."); + soc21_asic_reset(adev); + } + return soc21_common_hw_init(adev); }