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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9CC8BC0032E for ; Tue, 7 Nov 2023 12:29:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234674AbjKGM3Q (ORCPT ); Tue, 7 Nov 2023 07:29:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34722 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234684AbjKGM25 (ORCPT ); Tue, 7 Nov 2023 07:28:57 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A951A34896; Tue, 7 Nov 2023 04:19:52 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 06A4CC43395; Tue, 7 Nov 2023 12:19:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1699359573; bh=TZlEhB+YjBjV3vX8NIwK7ntLlJoBAsRXJDR6c8tgAUw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cp5OWrE3lzkTly09yQQpdi4Yj9FqVWQTGBmwNqkugG0Jqg+rbN9SDqIS7djlS/lnd /TWxDVCW2vD4w8Eh18Ek8JZG407VsHl0RHwnYdu41caFsm5dws+kT8PE5ZmEzRxBYa PnWlnDFN8VTa0UCnoZmiD3scKlnTj9BWxbtevkzPTET08bIQqXzD3aQmHCJtLHW8FR 4orR7c191EcnlQXfYUbnxJkTkxdpAJii0+eLPan90UvH1XUZnyquPl75xeMYVd99ID P1qULB6cFZyQh4lKKZJa6NApBm3rdtTpuv6cVT26nq0kF9DNMNjq6EEVIuI5KN87I/ D63F5LQJfCtvA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: "David (Ming Qiang) Wu" , Leo Liu , Alex Deucher , Sasha Levin , christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@gmail.com, daniel@ffwll.ch, James.Zhu@amd.com, tao.zhou1@amd.com, saleemkhan.jamadar@amd.com, gpiccoli@igalia.com, Hongkun.Zhang@amd.com, mario.limonciello@amd.com, srinivasan.shanmugam@amd.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 6.6 09/40] drm/amdgpu: not to save bo in the case of RAS err_event_athub Date: Tue, 7 Nov 2023 07:16:11 -0500 Message-ID: <20231107121837.3759358-9-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231107121837.3759358-1-sashal@kernel.org> References: <20231107121837.3759358-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: "David (Ming Qiang) Wu" [ Upstream commit fa1f1cc09d588a90c8ce3f507c47df257461d148 ] err_event_athub will corrupt VCPU buffer and not good to be restored in amdgpu_vcn_resume() and in this case the VCPU buffer needs to be cleared for VCN firmware to work properly. Acked-by: Leo Liu Signed-off-by: David (Ming Qiang) Wu Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c index 36b55d2bd51a9..03b4bcfca1963 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c @@ -292,8 +292,15 @@ int amdgpu_vcn_suspend(struct amdgpu_device *adev) void *ptr; int i, idx; + bool in_ras_intr = amdgpu_ras_intr_triggered(); + cancel_delayed_work_sync(&adev->vcn.idle_work); + /* err_event_athub will corrupt VCPU buffer, so we need to + * restore fw data and clear buffer in amdgpu_vcn_resume() */ + if (in_ras_intr) + return 0; + for (i = 0; i < adev->vcn.num_vcn_inst; ++i) { if (adev->vcn.harvest_config & (1 << i)) continue; -- 2.42.0