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 3DC95EE4996 for ; Tue, 22 Aug 2023 11:43:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235108AbjHVLn1 (ORCPT ); Tue, 22 Aug 2023 07:43:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56498 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235095AbjHVLn0 (ORCPT ); Tue, 22 Aug 2023 07:43:26 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A0E7F1BE; Tue, 22 Aug 2023 04:43:00 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id B26E36538E; Tue, 22 Aug 2023 11:36:48 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0DB4CC433C9; Tue, 22 Aug 2023 11:36:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1692704208; bh=FPb85KBsLtIuV93aWYRoqyPZudRHIE7GTm0niEodijU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mgY9XXlPwfB1oHLxsEcOHSjkNNYtz2KTMAv6efMfawx4HcZvuUZIVvLcYGjIzbOkw H7uJCZnZ8HUHRQuQDBKQFb9uptplp19JYPtwAapKAxmytBOtoxLbOxvUOxM3sNmAJT vN2cE/pHw/RcRuXOlD2RrxHF6NzZx/kU6Q0HPser+YjoUnI1izkGBdzQHP9AyftNbp ntVuPMZI41J2sjb5YTFjpKuRg89awP55Zu/kwOAoeGcNOVpwst+hVrcsZdDFbHzbuU bo/GM/L1uHJsl1OmO9LO/9A3el8/MNOb988P54fpWMXaL1pmmMR7wBLBuUbhkTvWZ5 /YUik8WVjWRyg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Tim Huang , Mario Limonciello , Alex Deucher , Sasha Levin , evan.quan@amd.com, christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@gmail.com, daniel@ffwll.ch, Hawking.Zhang@amd.com, kenneth.feng@amd.com, lijo.lazar@amd.com, Kun.Liu2@amd.com, trix@redhat.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 6.1 06/10] drm/amd/pm: skip the RLC stop when S0i3 suspend for SMU v13.0.4/11 Date: Tue, 22 Aug 2023 07:36:24 -0400 Message-Id: <20230822113628.3551393-6-sashal@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230822113628.3551393-1-sashal@kernel.org> References: <20230822113628.3551393-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.1.46 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Tim Huang [ Upstream commit 730d44e1fa306a20746ad4a85da550662aed9daa ] For SMU v13.0.4/11, driver does not need to stop RLC for S0i3, the firmwares will handle that properly. Signed-off-by: Tim Huang Reviewed-by: Mario Limonciello Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c index d191ff52d4f06..a664a0a284784 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c @@ -1562,9 +1562,9 @@ static int smu_disable_dpms(struct smu_context *smu) /* * For SMU 13.0.4/11, PMFW will handle the features disablement properly - * for gpu reset case. Driver involvement is unnecessary. + * for gpu reset and S0i3 cases. Driver involvement is unnecessary. */ - if (amdgpu_in_reset(adev)) { + if (amdgpu_in_reset(adev) || adev->in_s0ix) { switch (adev->ip_versions[MP1_HWIP][0]) { case IP_VERSION(13, 0, 4): case IP_VERSION(13, 0, 11): -- 2.40.1