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 60F17C4332F for ; Wed, 4 Jan 2023 14:42:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239662AbjADOmd (ORCPT ); Wed, 4 Jan 2023 09:42:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34140 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233812AbjADOmR (ORCPT ); Wed, 4 Jan 2023 09:42:17 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1831FCFE for ; Wed, 4 Jan 2023 06:42:11 -0800 (PST) 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 dfw.source.kernel.org (Postfix) with ESMTPS id A7CB461764 for ; Wed, 4 Jan 2023 14:42:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AEF38C433F1; Wed, 4 Jan 2023 14:42:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1672843330; bh=bK54aO0Dy8hBDWONZrok8eRkNJKbEJyvJFKsEJZNlJ4=; h=Subject:To:Cc:From:Date:From; b=AqiHckA8O7/B1hSyS1UlWNWaRcE5NVG2RAugCcgIDY18u8Lj1jphrzLlMaTmBveHQ DGpYUR68zqoSWpxSyiDWaQC1Wfo8/IVodVa2nqAJ/SIuH5EZpKMiPyGjTF7DtRJqW8 hCZ3lgZVY3sNNdQLt2J9LdCHuNP/tduQwm9vkBjE= Subject: FAILED: patch "[PATCH] drm/amd/pm: add SMU IP v13.0.4 IF version define to V7" failed to apply to 6.1-stable tree To: tim.huang@amd.com, alexander.deucher@amd.com, mario.limonciello@amd.com Cc: From: Date: Wed, 04 Jan 2023 15:42:03 +0100 Message-ID: <1672843323111133@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . Possible dependencies: 027bf0cee89a ("drm/amd/pm: add SMU IP v13.0.4 IF version define to V7") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 027bf0cee89a27325a9a4f2240c21dd5fb81e4fa Mon Sep 17 00:00:00 2001 From: Tim Huang Date: Thu, 29 Sep 2022 15:06:47 +0800 Subject: [PATCH] drm/amd/pm: add SMU IP v13.0.4 IF version define to V7 The pmfw has changed the driver interface version, so keep same with the fw. Signed-off-by: Tim Huang Reviewed-by: Mario Limonciello Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org # 6.0.x diff --git a/drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h b/drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h index 9d62ea2af132..8f72202aea8e 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h +++ b/drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h @@ -28,7 +28,7 @@ #define SMU13_DRIVER_IF_VERSION_INV 0xFFFFFFFF #define SMU13_DRIVER_IF_VERSION_YELLOW_CARP 0x04 #define SMU13_DRIVER_IF_VERSION_ALDE 0x08 -#define SMU13_DRIVER_IF_VERSION_SMU_V13_0_4 0x05 +#define SMU13_DRIVER_IF_VERSION_SMU_V13_0_4 0x07 #define SMU13_DRIVER_IF_VERSION_SMU_V13_0_5 0x04 #define SMU13_DRIVER_IF_VERSION_SMU_V13_0_0 0x30 #define SMU13_DRIVER_IF_VERSION_SMU_V13_0_7 0x2C