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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9CE36CF0423 for ; Tue, 8 Oct 2024 21:16:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8E4A610E5C5; Tue, 8 Oct 2024 21:16:26 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=amd.com header.i=@amd.com header.b="G4mce2gG"; dkim-atps=neutral Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2048.outbound.protection.outlook.com [40.107.237.48]) by gabe.freedesktop.org (Postfix) with ESMTPS id 16E2710E25B for ; Tue, 8 Oct 2024 21:16:25 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=aW0VfVccCZAWybTs4B6OIGcvf1aqFdJFLN7RI23UHtYl52Ywls7wG9ls7JOObvPMY7MCnVln4g9XNRb85HUa0SCWx35KQBnvjNpx1GoK+fpMX2Mpn5tb9aC9OuJqd2lln04jOp6yVLswjpEAFxGsqN+JRkp004Alt8LKrIaXxje6/E8BhExk1Jac4iVrsnNxUW7TUqsAbICmKSkS2JlaJhr0BahHN1zGUdRqr32/DHky7r0FsOYk3FkBPI53TLHenWrflKmJ96cBKfjTNoKnHslNNUmOAOotkE44IiregmOk6e63U1Axj9u1ki6Rb4O+ig7m38zxvot52QVX5WVu2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=MKxMIqXHuqlu/CsSGUyD75UnE0d+/8wK9qJ2DKAsLcI=; b=YN1E+8WvDnaKcODvz6PX0oaBew+Mgx8wnGZiNrYyeVbEiQST1ACT/5oynHHezMD0txFhzH6a3kB0sFLeEtwWT3o3432mbpZl6hhlK/zR7Ej+4VCyvlp0yXe4vZk/6iHBMmPMUF5AV6XIdsBOVAzpTqc8GyN+M0kemoCotz9dyKH5aAeDgoCqWxm3m1vUvZ+y0+i6f6q6nUgrR/fjUvvNp1VRP38/ycsH3Qxbw6tF5gJUbGvU7+FaxymBF97vE/9mNRHa/8TvK768n7F5fkAGtrcwaW5tmpDq0O+yFi51dODkjnkdd1wkRxD0liWLr0p37yEWGqRGTrwAI8eb1eTxoA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.freedesktop.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=MKxMIqXHuqlu/CsSGUyD75UnE0d+/8wK9qJ2DKAsLcI=; b=G4mce2gGQKaufOHwiEkVsIfNNqJgcWtp4HYHiKMsW6ke3QeOaJNj1YaWOb+ij+3khPZ4rTuDUTDnzae1xe1u5vsRwJEPO0eWmI2NJKG3lXtby8TQ2l3XQzSsCoLkmsjtX7+GniA0c0OAxyHCKo1uQUr4AdfVvQYbu38xpBVHzCk= Received: from CH0PR03CA0405.namprd03.prod.outlook.com (2603:10b6:610:11b::15) by DS0PR12MB7928.namprd12.prod.outlook.com (2603:10b6:8:14c::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8026.20; Tue, 8 Oct 2024 21:16:20 +0000 Received: from DS2PEPF00003442.namprd04.prod.outlook.com (2603:10b6:610:11b:cafe::d4) by CH0PR03CA0405.outlook.office365.com (2603:10b6:610:11b::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8048.17 via Frontend Transport; Tue, 8 Oct 2024 21:16:20 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DS2PEPF00003442.mail.protection.outlook.com (10.167.17.69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8048.13 via Frontend Transport; Tue, 8 Oct 2024 21:16:19 +0000 Received: from atitest-Rembrandt.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Tue, 8 Oct 2024 16:16:18 -0500 From: To: , , , , CC: Boyuan Zhang Subject: [PATCH 01/32] drm/amd/pm: add inst to dpm_set_vcn_enable Date: Tue, 8 Oct 2024 17:15:22 -0400 Message-ID: <20241008211553.36264-2-boyuan.zhang@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241008211553.36264-1-boyuan.zhang@amd.com> References: <20241008211553.36264-1-boyuan.zhang@amd.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS2PEPF00003442:EE_|DS0PR12MB7928:EE_ X-MS-Office365-Filtering-Correlation-Id: 3e7eadc9-8230-4b7d-4f07-08dce7de745f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|36860700013|1800799024|376014; X-Microsoft-Antispam-Message-Info: =?utf-8?B?LzBoaGpnaTc0cC9ycXVsS2NiQ1Bvd2RxTmpEdmN0cVAwSW9xeGtqV3JxWnFt?= =?utf-8?B?YXlndXp4OXB1YjlTZ2Q2dmE4R2pNN25jUUo4aUlFWjFzb3A2U3JhOHJJblhI?= =?utf-8?B?aTlBbm5MWUV1NlpVdVUyQXBMQ3RsUlNMaXBkb1dqNnRQeUxVSEgvaHNzMUx0?= =?utf-8?B?TzhUT0dlV2lsTDRDcFJiR3dEeHo4UGNOZ2duWDJ4THFSNjdNd1R6ZkNWbUV2?= =?utf-8?B?a3FDYlk4QUduMWhGNHNXUTdNdTVXMUIzZmV4bUttL3JmOUdYK0tCN0lSNEw3?= =?utf-8?B?ZDhxQXlNblFBODh1dlhPRTQxT2xXSzRFMkZQSjErVk9WYjlUb2tpSzZjTjlF?= =?utf-8?B?SURFbExOdDJiOHNKVStnOUFxVFZjUUFIazVtRUQ0QTBqZlFUUjBPZlZVME9u?= =?utf-8?B?RnFSQ2RnTmIxdHBYbTVyNmVWODlPY2o4Y3JkSDk1Skp5RHJtbTJnSERzdllp?= =?utf-8?B?QzdSUXlRajNEWDlyRkpodktCcUVRbDNQQWZ0OW5KSEcyckh6MitNaEJRdzBj?= =?utf-8?B?bGdJaXN2SWsvSE1MKzdySDlyVHU1Ty85TVBXZm5HWTExb0dvNlRaNm1KYWVV?= =?utf-8?B?US9SdkM0OUxoUDlMWFVZa3lERmo2aEEveTV2bnY2eXJwQ3VSWlhqVTNpNS91?= =?utf-8?B?Q3dFaThjazN6cVExSzB1RGt1d3hPVUY0L2hTVExtV2ZrekpjR1ZTVVp2QWFE?= =?utf-8?B?Y1pITVBLK1luMDM3RWNFc2YzWGh6c24vMVF4b0xkZjJoemxrNENlWHBPczhE?= =?utf-8?B?Nk5VdVo5MXlqNmhkMGlvK2hmM2N6b1E1YnB3MFhRcWs4dDNqYmpINEpJY2lT?= =?utf-8?B?bVhyb1BlV2VvNjFKbEpFRkhwaUkzWHdvekRIVk1XbkUzTkNBUkc0bjRCK3Iz?= =?utf-8?B?MXJCTnMyOUN6b01KUHpkaGg4STBvdFJMamFGbld3aVBPbmhtYTBDMTJoZlEy?= =?utf-8?B?YnFOOHF5SVpWRU1lQzJCVGFvUnBBNWw4V1Rwd1BqTHkzdjNNb2xiLzdxVzJs?= =?utf-8?B?OTRPK0lOMUx1cEEyUW1HcXM2UUcyYTYvRUZCYUVTMVpmdThHcG00eTdId0li?= =?utf-8?B?MkgxU0hMYjRId0FrWDRHNHQ1TTRnN2ZrUlRWZlJuWVcreEs3WWlNMzhiRXpo?= =?utf-8?B?eTBpNTBlcldEUlVHTnpGMk9VbVd3cDd2MktCdmVCb242Z1RjYXd0TVFQazlB?= =?utf-8?B?S1RqeE1iVjdmTXExck9aQVE1Szk3T08vSWJoTWRzM2YrczZ4QkRhdGh2TCt2?= =?utf-8?B?N3BoSHBrU0M0L2k2YVkvVzkrZHFWck15RUYwTUdIUWgvdWhKdXJPYS8zS0l4?= =?utf-8?B?SmlCTXFWd2Zxd1V5d3pDUmZNUjJ0cHJNbkNwVTVWemlucEQrTWJ4U3NmZDRX?= =?utf-8?B?RTBEQk9LeFdBaHM2OGh0SU14b1JESEdGNFBYKzJSb2M3NURLS0ZXYTZqdnUy?= =?utf-8?B?UXJGVFM1WHZMdktyQXJWVXI5WTRPeFBHU3JjN1RVc1gxVWJFcVZJTS9vaWw4?= =?utf-8?B?TnQwYnhvdE9OUEs4ZVMweVd4TE10SVR6aDhEUXlpQXByeS96VlU0TUloY2Ix?= =?utf-8?B?YkhwYVVsS3hFTHAzbXZuVUw2cm5EOFMwL2JBVmd5YitTejRqZGhJMS9xdEh6?= =?utf-8?B?bTMrWUt5QUJtMUtyY0FBMmZnNGRFL2ZyNW92NUFFUXhSR0FRb25jR0hhbmli?= =?utf-8?B?aDFvdWhpLzhHUHE3YVZQcWNCRTN6alNIM2JzRjFaWUoyaDc0NUR3MXI2azdJ?= =?utf-8?B?NWo3d2U4VXk3YnY5NS9IYkJuSDJmeFlXN2FpRVczR3dhS3JNc2JUVW9wT0Jt?= =?utf-8?Q?fVpqeMRpEtCt4RqFnD81KaQ2VQiCAblFyMDUA=3D?= X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230040)(82310400026)(36860700013)(1800799024)(376014); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Oct 2024 21:16:19.9052 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3e7eadc9-8230-4b7d-4f07-08dce7de745f X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DS2PEPF00003442.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB7928 X-BeenThere: amd-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces@lists.freedesktop.org Sender: "amd-gfx" From: Boyuan Zhang Add an instance parameter to the existing function dpm_set_vcn_enable() for future implementation. Re-write all pptable functions accordingly. v2: Remove duplicated dpm_set_vcn_enable() functions in v1. Instead, adding instance parameter to existing functions. Signed-off-by: Boyuan Zhang Suggested-by: Christian König Suggested-by: Alex Deucher --- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 2 +- drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 2 +- drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 3 ++- drivers/gpu/drm/amd/pm/swsmu/inc/smu_v14_0.h | 3 ++- drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 4 +++- drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 4 +++- drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 4 +++- drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 4 +++- drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c | 4 +++- drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 3 ++- drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c | 4 +++- drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 4 +++- drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c | 3 ++- 13 files changed, 31 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c index 5b0cdda96b38..6305fd7d2573 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c @@ -251,7 +251,7 @@ static int smu_dpm_set_vcn_enable(struct smu_context *smu, if (atomic_read(&power_gate->vcn_gated) ^ enable) return 0; - ret = smu->ppt_funcs->dpm_set_vcn_enable(smu, enable); + ret = smu->ppt_funcs->dpm_set_vcn_enable(smu, enable, 0xff); if (!ret) atomic_set(&power_gate->vcn_gated, !enable); diff --git a/drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h b/drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h index 727da0c37e06..0f074b6c8b58 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h +++ b/drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h @@ -739,7 +739,7 @@ struct pptable_funcs { * @dpm_set_vcn_enable: Enable/disable VCN engine dynamic power * management. */ - int (*dpm_set_vcn_enable)(struct smu_context *smu, bool enable); + int (*dpm_set_vcn_enable)(struct smu_context *smu, bool enable, int inst); /** * @dpm_set_jpeg_enable: Enable/disable JPEG engine dynamic power 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 e58220a7ee2f..229b9d16452f 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 @@ -255,7 +255,8 @@ int smu_v13_0_wait_for_event(struct smu_context *smu, enum smu_event_type event, uint64_t event_arg); int smu_v13_0_set_vcn_enable(struct smu_context *smu, - bool enable); + bool enable, + int inst); int smu_v13_0_set_jpeg_enable(struct smu_context *smu, bool enable); diff --git a/drivers/gpu/drm/amd/pm/swsmu/inc/smu_v14_0.h b/drivers/gpu/drm/amd/pm/swsmu/inc/smu_v14_0.h index 46b456590a08..c7071159f8ec 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/inc/smu_v14_0.h +++ b/drivers/gpu/drm/amd/pm/swsmu/inc/smu_v14_0.h @@ -210,7 +210,8 @@ int smu_v14_0_wait_for_event(struct smu_context *smu, enum smu_event_type event, uint64_t event_arg); int smu_v14_0_set_vcn_enable(struct smu_context *smu, - bool enable); + bool enable, + int inst); int smu_v14_0_set_jpeg_enable(struct smu_context *smu, bool enable); diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c index 5ad09323a29d..6c8e80f6b592 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c +++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c @@ -1571,7 +1571,9 @@ static bool arcturus_is_dpm_running(struct smu_context *smu) return !!(feature_enabled & SMC_DPM_FEATURE); } -static int arcturus_dpm_set_vcn_enable(struct smu_context *smu, bool enable) +static int arcturus_dpm_set_vcn_enable(struct smu_context *smu, + bool enable, + int inst) { int ret = 0; diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c index 16af1a329621..29a3b96ffaec 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c @@ -1135,7 +1135,9 @@ static int navi10_set_default_dpm_table(struct smu_context *smu) return 0; } -static int navi10_dpm_set_vcn_enable(struct smu_context *smu, bool enable) +static int navi10_dpm_set_vcn_enable(struct smu_context *smu, + bool enable, + int inst) { int ret = 0; diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c index 3b29cb74c47b..2438f813d6db 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c @@ -1152,7 +1152,9 @@ static int sienna_cichlid_set_default_dpm_table(struct smu_context *smu) return 0; } -static int sienna_cichlid_dpm_set_vcn_enable(struct smu_context *smu, bool enable) +static int sienna_cichlid_dpm_set_vcn_enable(struct smu_context *smu, + bool enable, + int inst) { struct amdgpu_device *adev = smu->adev; int i, ret = 0; diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c index 22737b11b1bf..656505d2404b 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c @@ -459,7 +459,9 @@ static int vangogh_init_smc_tables(struct smu_context *smu) return smu_v11_0_init_smc_tables(smu); } -static int vangogh_dpm_set_vcn_enable(struct smu_context *smu, bool enable) +static int vangogh_dpm_set_vcn_enable(struct smu_context *smu, + bool enable, + int inst) { int ret = 0; diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c index cc0504b063fa..8d9fb80f36f7 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c +++ b/drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c @@ -645,7 +645,9 @@ static enum amd_pm_state_type renoir_get_current_power_state(struct smu_context return pm_type; } -static int renoir_dpm_set_vcn_enable(struct smu_context *smu, bool enable) +static int renoir_dpm_set_vcn_enable(struct smu_context *smu, + bool enable, + int inst) { int ret = 0; diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c index e17466cc1952..1d37b9e251d4 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 @@ -2088,7 +2088,8 @@ int smu_v13_0_get_current_pcie_link_speed(struct smu_context *smu) } int smu_v13_0_set_vcn_enable(struct smu_context *smu, - bool enable) + bool enable, + int inst) { struct amdgpu_device *adev = smu->adev; int i, ret = 0; diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c index 9c2c43bfed0b..3204917f91bf 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c +++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c @@ -193,7 +193,9 @@ static int smu_v13_0_5_system_features_control(struct smu_context *smu, bool en) return ret; } -static int smu_v13_0_5_dpm_set_vcn_enable(struct smu_context *smu, bool enable) +static int smu_v13_0_5_dpm_set_vcn_enable(struct smu_context *smu, + bool enable, + int inst) { int ret = 0; diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c index 260c339f89c5..0890951351f9 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c +++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c @@ -220,7 +220,9 @@ static int yellow_carp_system_features_control(struct smu_context *smu, bool en) return ret; } -static int yellow_carp_dpm_set_vcn_enable(struct smu_context *smu, bool enable) +static int yellow_carp_dpm_set_vcn_enable(struct smu_context *smu, + bool enable, + int inst) { int ret = 0; diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c b/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c index 865e916fc425..5e1165ecdf7b 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c +++ b/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c @@ -1492,7 +1492,8 @@ int smu_v14_0_set_single_dpm_table(struct smu_context *smu, } int smu_v14_0_set_vcn_enable(struct smu_context *smu, - bool enable) + bool enable, + int inst) { struct amdgpu_device *adev = smu->adev; int i, ret = 0; -- 2.34.1