From nobody Thu Dec 18 08:36:22 2025 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 52B76C6FA85 for ; Fri, 2 Sep 2022 12:54:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237945AbiIBMyg (ORCPT ); Fri, 2 Sep 2022 08:54:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56926 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237847AbiIBMxR (ORCPT ); Fri, 2 Sep 2022 08:53:17 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2E224F8FE4; Fri, 2 Sep 2022 05:37:44 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 866BAB82A91; Fri, 2 Sep 2022 12:36:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D06FBC433C1; Fri, 2 Sep 2022 12:36:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1662122198; bh=RtY/8ZtIdexA5KplFfjBrgI2nAZ6OSMG37qt/NcJDC4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=O7PS2vrAme0yGFNLgUW/oY33g1rSgNWv+h1KkfLF3V4orxb634szyCotEKmAcbJH9 QnmXx7DMFa6oBZT4zi3uXuPkFWcAQeQtlUB5im9JE0LogS9GhRUQbfOkz7+yOwBG74 XByFydVBhAC5L5Te1t7VJ1YA8F8IWW7divnza7+Q= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kenneth Feng , Feifei Xu , Alex Deucher , Sasha Levin Subject: [PATCH 5.19 43/72] drm/amd/pm: skip pptable override for smu_v13_0_7 Date: Fri, 2 Sep 2022 14:19:19 +0200 Message-Id: <20220902121406.185535938@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220902121404.772492078@linuxfoundation.org> References: <20220902121404.772492078@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Kenneth Feng [ Upstream commit 4e64b529c5b04e7944b41de554ee686ecab00744 ] skip pptable override for smu_v13_0_7 secure boards only. Signed-off-by: Kenneth Feng Reviewed-by: Feifei Xu Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c b/drivers/gpu/d= rm/amd/pm/swsmu/smu13/smu_v13_0.c index 5aa08c031f721..1d8a9e5b3cc08 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c +++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c @@ -203,6 +203,9 @@ int smu_v13_0_init_pptable_microcode(struct smu_context= *smu) if (!adev->scpm_enabled) return 0; =20 + if (adev->ip_versions[MP1_HWIP][0] =3D=3D IP_VERSION(13, 0, 7)) + return 0; + /* override pptable_id from driver parameter */ if (amdgpu_smu_pptable_id >=3D 0) { pptable_id =3D amdgpu_smu_pptable_id; @@ -210,13 +213,6 @@ int smu_v13_0_init_pptable_microcode(struct smu_contex= t *smu) } else { pptable_id =3D smu->smu_table.boot_values.pp_table_id; =20 - if (adev->ip_versions[MP1_HWIP][0] =3D=3D IP_VERSION(13, 0, 7) && - pptable_id =3D=3D 3667) - pptable_id =3D 36671; - - if (adev->ip_versions[MP1_HWIP][0] =3D=3D IP_VERSION(13, 0, 7) && - pptable_id =3D=3D 3688) - pptable_id =3D 36881; /* * Temporary solution for SMU V13.0.0 with SCPM enabled: * - use 36831 signed pptable when pp_table_id is 3683 --=20 2.35.1