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 43AA5C433F5 for ; Wed, 1 Dec 2021 03:38:07 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A4A9989F41; Wed, 1 Dec 2021 03:38:06 +0000 (UTC) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2045.outbound.protection.outlook.com [40.107.94.45]) by gabe.freedesktop.org (Postfix) with ESMTPS id DC61989F41 for ; Wed, 1 Dec 2021 03:38:05 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ja5fpOuxdFGN6gDq+VjVyNE548lkGyDDtg+gjmMNpwtoffnZ5cSnFg4vGRcwfiVpMF2Z3vmwKeZUa0xeXNnAnbiqDnTJHUtMpUPci136zUaiYER3CORo+S7mXyXyK9iGLNY6Y7kk02TPf8qlLI8+1vDEU5eKAWRajuz5539CL/6N4bAXH49xnRbXtq8K93d6S3ggCbgKy9hjFbpJNPNIzOtDgndpS81z+RCtE+eaeAEw000Jbm1+QM1QbzhuQ3SUDcjupdAiv4L80j8OMAEV9y3gMDUnGRvHWwRnirbfGk5zDCQDckOFYYcJoVR+P/eFYgw85OIL/nJ3akbT98+Nbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=ThG0zrGcL9cVhTcmP3BHdnc9e/ArEuJZ3Gscu4pR3hY=; b=AaSOs/Qpfq7/c4qPk9S7iAq/Uf5c7Yiw96h9ORf+NxgJ+eqbFeEmWzN1fEXhS3psBlO9G5lsMBP1B19EO4RgTHkCpZJZK3EGQfhH8kKc0U+VZ8UVKxgk0yQo4LnmXD01gFtomIMPOSTwSE9fBZl4QmO4cyfaiLDv+uwhHE/UAt3L5M9Z/BqPhkxw2S9cwdwjHEmO/2fuHHxinswgLQ8jCJv+zsSmI08jVkqR8oEuDWuJKRe4qkbTuGosoA/33SXCBw6pjJYy9H8MiF2UKeM6kXLvF4y57zpi0iW3flLZslRkyTW72yPlU0IIIML4RuJUCjJaKoVt+GtL6nqzs4LdXg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none 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=ThG0zrGcL9cVhTcmP3BHdnc9e/ArEuJZ3Gscu4pR3hY=; b=DlHum+fvmlhB/DBBWbPT2S+vUBd+ml1fwhxoI0VpzpmsFRVTaitZmttQIGspP9EDOslqDB02FQ1KF5+VZFWU2znm38trztJ2iIS6hGPRawvh6/R9ntu9JbwCSDwPyGjUOfkc6ZBEqbMSqX3FMhmTFA4cvg3rtwULnFFtd92YSJc= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=amd.com; Received: from DM6PR12MB3930.namprd12.prod.outlook.com (2603:10b6:5:1c9::19) by DM6PR12MB3211.namprd12.prod.outlook.com (2603:10b6:5:15c::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.26; Wed, 1 Dec 2021 03:38:03 +0000 Received: from DM6PR12MB3930.namprd12.prod.outlook.com ([fe80::41ea:d7dc:f041:633c]) by DM6PR12MB3930.namprd12.prod.outlook.com ([fe80::41ea:d7dc:f041:633c%5]) with mapi id 15.20.4734.024; Wed, 1 Dec 2021 03:38:03 +0000 Message-ID: <3fbb283a-1876-102c-ce8a-ab1fb17698ec@amd.com> Date: Wed, 1 Dec 2021 09:07:50 +0530 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.3.1 Subject: Re: [PATCH V2 01/17] drm/amd/pm: do not expose implementation details to other blocks out of power Content-Language: en-US From: "Lazar, Lijo" To: Evan Quan , amd-gfx@lists.freedesktop.org References: <20211130074259.1271965-1-evan.quan@amd.com> <20211130074259.1271965-2-evan.quan@amd.com> In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-ClientProxiedBy: PN2PR01CA0067.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:23::12) To DM6PR12MB3930.namprd12.prod.outlook.com (2603:10b6:5:1c9::19) MIME-Version: 1.0 Received: from [10.252.81.250] (165.204.159.242) by PN2PR01CA0067.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:23::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.23 via Frontend Transport; Wed, 1 Dec 2021 03:38:00 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7c7994fb-97b6-4fa8-a0de-08d9b47bfacd X-MS-TrafficTypeDiagnostic: DM6PR12MB3211: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3826; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qThLuNX1Fk3Y1pXAWZh0cg0WOQTH/ZGTi0epe0q3Q84oh8fG9UsEiySqF9fCWH+MndyEP04tBOCNob9aZoXdQN6wrBheyalGusR5ydoCJwn5V48rgCJM54QnS3KPyjOboFbWjswNkRBtBZUdutFFVWcs2l5HyFh3a/ZOnfiDdVR5LSV2S/Eqk8J40rMQBnN/JnBz82sBhAzB+t1bKUc4tsWD+6HSq9pO8X0dNftEW2UgxbQ1Cr4k+30zB5t7OCk5lNATnHf4MpzTy8m+p09kjw34hucfhTTzW1US+ImDmzK8yc/P5VuaKGSw7lXARuZ7sF7xSa91xjKYfGxpGih2bOEYWPM4XFsE6uhpZfQqy3vCggiKHSFaqvD+4pwS48Kq4fSn6tEnl1WTjtJJUZCbRRp+KwNNhT2Cm3HFxrZ5VWKV1EhCxByEzJScmkOAMA406dA07UWCr2K0rjle4sZeDNLk92Is0kw8l5KvmX09cLDZjGzRa7ppM2bfb07yNnFrjKrpCwBM+j3wBXhbSVYcsH0riF5AcpPIKNha5FmIaXSCQXXbbotfkpG0FOURq2eCiIT+S2KN50oqYJy5+wN5wmGsq+zypx8UmyrpJN2D/CmLh2clssG3081ZWvmZn5XyDlvm0xSCYSJkIPnJbFsq5GpbWJi4X8HOZODxIIkfFWAdPKhAZFuWJwzVP1FciYMh6UP9TnSNAsrh4qoPFvwsBXft0PqpGAZcW4rcFSTzQ5uyWNnmof76zCwxaMgpfmZr X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM6PR12MB3930.namprd12.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(38100700002)(26005)(53546011)(956004)(508600001)(8676002)(86362001)(4326008)(8936002)(2616005)(31696002)(83380400001)(16576012)(5660300002)(316002)(36756003)(30864003)(66476007)(19627235002)(66946007)(2906002)(31686004)(66556008)(186003)(6666004)(6486002)(45980500001)(43740500002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?S1NGcmpFVWxzQVpDV210M3ZlRXlNbFVOenc4K2JJaDhzb290ZlhuSDUyaVUv?= =?utf-8?B?Q2FRV28xSXFOVFViN3YrenlJMW4zVWZEZmxhZ3ZSVEJ2dG5hcHAweWl5MXds?= =?utf-8?B?dDZiM04yOThPOUJHYjJzaEFCK1Rna05RaXJGVlorVjFmMkpGV3I3bmtjSS9j?= =?utf-8?B?WW5zb1hxUUlacS94NVU5UG03cnU0SnpjU0VBdUdnRlhzc0Z3U3QxZ0xETEVz?= =?utf-8?B?NGpMNVNGckJ0YTJZK3Rpb3R4L3RPOGl1ZVZlcE13c3g2b0JTdk90VllVMzRF?= =?utf-8?B?VElJUDNPMHUvNVlYTG5NSDVJK0MrWXRrV3ZGakFJMzFmeUVoOVlPc2Fad2Jp?= =?utf-8?B?T01QOHlpb3JvUjRQWXM4dUJiZ1dzdy9hcG1lQXVLRzl3V0VtY096ZG11SDhy?= =?utf-8?B?WWxyMHQvaUZyT3d6cWl3OHRmdk03NC9mYXJGNXYwYlR4d0FiUlRJRCsya0Yv?= =?utf-8?B?OERSQVlZbTRraUgwK1hUTDFQOUxjSVJQdUNpV0VyTTlOZEkrdEN2NmR0L3A4?= =?utf-8?B?NmN4cWdqdm9ndUZaUmFPdHFSSnZsK0lSL0diZGhLSHN6eUU1cnBtS0pIeitt?= =?utf-8?B?cEh0UHJrbGJRRmVQSzdWdmlTSEpLZDFpcGNRUzJuTFJReno2M3VadGc5eGdL?= =?utf-8?B?djM4Z091MnZic2ZVdXRkdHl1R0F2REZUbTFrZ2VDTk5BRjZyaitYWk9kS3VI?= =?utf-8?B?aTJvREU3ckZQdW5icVl5OHNxMmZpTm03dnlZdm9nbm1NNDgyeGVxUUdkeGZC?= =?utf-8?B?TUk4ZU0wZkhwUVZOeElkN0FtZWNwRjFUUFFQNFJFZkdxVldGNkgvM001M3NK?= =?utf-8?B?blN4dWkzTVl3VEpNSGVBOW0xSzl1SEdKMDAzMVNQcWlHbTlYVFRPbHZ0RWhw?= =?utf-8?B?OVYxQkV0aWYvem85Y0E2cEU4QnFkbnJzMVZKRE9mOXByVWxBaEdseDVBRFFH?= =?utf-8?B?MVlXYnBMNm9hKzNjVUlCQXZwN0RINzR1MFZ3cEczMHB6VGVORDZNaDJYdk1p?= =?utf-8?B?TGp0OWNGVzJzUjFpM2Z4azJWSmpIVHdqR0lsZm1mNytteUcrcWRyTWVFdEdF?= =?utf-8?B?NnVpNzQ5WWo1MS83Tk4wT2tJZVNHcWtxSjExNGgwMlFBNWRhanI2TzNrVW5o?= =?utf-8?B?VVJWWUxyb0g4cm5GUEFtRjBuNUtvd1ZPTmhlOXYvNWZoMzlxWWFmQlJjRElL?= =?utf-8?B?TkhoejFZS2RJbnJHSWNWdlZLTTF0Q3FWLzE3c3NkOWpGcWgvdXB1RWhIZStN?= =?utf-8?B?MFNjSWdGWDJlbmRyWVNGWFJjLzRxR3R1eHlIWTM2K0ZXNmJtMW9tTnNvaUtG?= =?utf-8?B?d0NIQy9uQzMzbjByL2xuaDZFRXluTENhRmxWb2l6ZHBIS1c2TlNiSkY0UUxQ?= =?utf-8?B?ZE84TEVkQnREd3BpaURsRVZqWkdyUHZGM2JaVnJDYWVPaTNTTmd2M0FtM3VM?= =?utf-8?B?REhqUWtralliemduRlZ5a3FxSStINktlVUpiZXFGWFFaRnkxUDU5Y01wNlAv?= =?utf-8?B?U21yelJ5Q2ZWTlpTeHJtY3JYSVNiRHF3bkJveDNkc2hBWktPVFVvQnpOZ25M?= =?utf-8?B?SDdpUy9SOXpEK2ExYjRBMHQ4VWFTdnhmVjdEalRsUEdkWnp1RmdKTlFDdXRX?= =?utf-8?B?QnpINUtkOFhNT2F0eDZIWWt3eG5JaHUxTmFQbHE2elMxOFhQVnI0ZEdjdExH?= =?utf-8?B?UVZwVC9ma3crVFgrSFViMlk5K2RsdlNOR2RwZkljcjN5QXlvSmQ4MlpKS1hu?= =?utf-8?B?MGp4V3RSRlZNZml0T1MyOUVHbk50VGNGcnQweWpHRGJ6NEJzbkEzQzJiYnFo?= =?utf-8?B?MXNKMnBYMUlUcnoyWjM0Qmo3YTRKdWYxOGV1VzBzNGFGL1ovbmprRHFXb2cv?= =?utf-8?B?VmI5TWJoSEIybVBrUEZJUXZGSWY4alhRUE9HdmNNeFg2RnFhU2JHQVQ2ZGxL?= =?utf-8?B?NWw3UGNrblE0YlFOMDFHWkg5UmFxQXhURGdoKzd1L1FneXZGdkMrUWRnNkow?= =?utf-8?B?bkJyckk4RFRFWUNUdUp3QmpNZlE0M0p6UkEyMWtOZzJzTTl1eVdocXZacmNQ?= =?utf-8?B?WnVEQ0ZyNU14bFd0WmhGUW5oenBxbEJna2VTQmR2S3hoRDltTmwzem9UMHJp?= =?utf-8?Q?/Ft0=3D?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7c7994fb-97b6-4fa8-a0de-08d9b47bfacd X-MS-Exchange-CrossTenant-AuthSource: DM6PR12MB3930.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Dec 2021 03:38:03.6639 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: +rbsnW7yeLl80hTwLGcXcN53WsISC+DX3hH87bPghDeMxEAJ5fb9pYOBtu3QWbGM X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3211 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: , Cc: Alexander.Deucher@amd.com, Kenneth.Feng@amd.com, christian.koenig@amd.com Errors-To: amd-gfx-bounces@lists.freedesktop.org Sender: "amd-gfx" On 11/30/2021 1:39 PM, Lazar, Lijo wrote: > > > On 11/30/2021 1:12 PM, Evan Quan wrote: >> Those implementation details(whether swsmu supported, some ppt_funcs >> supported, >> accessing internal statistics ...)should be kept internally. It's not >> a good >> practice and even error prone to expose implementation details. >> >> Signed-off-by: Evan Quan >> Change-Id: Ibca3462ceaa26a27a9145282b60c6ce5deca7752 >> --- >>   drivers/gpu/drm/amd/amdgpu/aldebaran.c        |  2 +- >>   drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c   | 25 ++--- >>   drivers/gpu/drm/amd/amdgpu/amdgpu_device.c    |  6 +- >>   drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c       | 18 +--- >>   drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h       |  7 -- >>   drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c       |  5 +- >>   drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c       |  5 +- >>   drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c   |  2 +- >>   .../gpu/drm/amd/include/kgd_pp_interface.h    |  4 + >>   drivers/gpu/drm/amd/pm/amdgpu_dpm.c           | 95 +++++++++++++++++++ >>   drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h       | 25 ++++- >>   drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h       |  9 +- >>   drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c     | 16 ++-- >>   13 files changed, 155 insertions(+), 64 deletions(-) >> >> diff --git a/drivers/gpu/drm/amd/amdgpu/aldebaran.c >> b/drivers/gpu/drm/amd/amdgpu/aldebaran.c >> index bcfdb63b1d42..a545df4efce1 100644 >> --- a/drivers/gpu/drm/amd/amdgpu/aldebaran.c >> +++ b/drivers/gpu/drm/amd/amdgpu/aldebaran.c >> @@ -260,7 +260,7 @@ static int aldebaran_mode2_restore_ip(struct >> amdgpu_device *adev) >>       adev->gfx.rlc.funcs->resume(adev); >>       /* Wait for FW reset event complete */ >> -    r = smu_wait_for_event(adev, SMU_EVENT_RESET_COMPLETE, 0); >> +    r = amdgpu_dpm_wait_for_event(adev, SMU_EVENT_RESET_COMPLETE, 0); >>       if (r) { >>           dev_err(adev->dev, >>               "Failed to get response from firmware after reset\n"); >> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c >> b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c >> index 164d6a9e9fbb..0d1f00b24aae 100644 >> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c >> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c >> @@ -1585,22 +1585,25 @@ static int amdgpu_debugfs_sclk_set(void *data, >> u64 val) >>           return ret; >>       } >> -    if (is_support_sw_smu(adev)) { >> -        ret = smu_get_dpm_freq_range(&adev->smu, SMU_SCLK, &min_freq, >> &max_freq); >> -        if (ret || val > max_freq || val < min_freq) >> -            return -EINVAL; >> -        ret = smu_set_soft_freq_range(&adev->smu, SMU_SCLK, >> (uint32_t)val, (uint32_t)val); >> -    } else { >> -        return 0; >> +    ret = amdgpu_dpm_get_dpm_freq_range(adev, PP_SCLK, &min_freq, >> &max_freq); >> +    if (ret == -EOPNOTSUPP) { >> +        ret = 0; >> +        goto out; >>       } >> +    if (ret || val > max_freq || val < min_freq) { >> +        ret = -EINVAL; >> +        goto out; >> +    } >> + >> +    ret = amdgpu_dpm_set_soft_freq_range(adev, PP_SCLK, >> (uint32_t)val, (uint32_t)val); >> +    if (ret) >> +        ret = -EINVAL; >> +out: >>       pm_runtime_mark_last_busy(adev_to_drm(adev)->dev); >>       pm_runtime_put_autosuspend(adev_to_drm(adev)->dev); >> -    if (ret) >> -        return -EINVAL; >> - >> -    return 0; >> +    return ret; >>   } >>   DEFINE_DEBUGFS_ATTRIBUTE(fops_ib_preempt, NULL, >> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c >> b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c >> index 1989f9e9379e..41cc1ffb5809 100644 >> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c >> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c >> @@ -2617,7 +2617,7 @@ static int amdgpu_device_ip_late_init(struct >> amdgpu_device *adev) >>       if (adev->asic_type == CHIP_ARCTURUS && >>           amdgpu_passthrough(adev) && >>           adev->gmc.xgmi.num_physical_nodes > 1) >> -        smu_set_light_sbr(&adev->smu, true); >> +        amdgpu_dpm_set_light_sbr(adev, true); >>       if (adev->gmc.xgmi.num_physical_nodes > 1) { >>           mutex_lock(&mgpu_info.mutex); >> @@ -2857,7 +2857,7 @@ static int >> amdgpu_device_ip_suspend_phase2(struct amdgpu_device *adev) >>       int i, r; >>       if (adev->in_s0ix) >> -        amdgpu_gfx_state_change_set(adev, sGpuChangeState_D3Entry); >> +        amdgpu_dpm_gfx_state_change(adev, sGpuChangeState_D3Entry); >>       for (i = adev->num_ip_blocks - 1; i >= 0; i--) { >>           if (!adev->ip_blocks[i].status.valid) >> @@ -3982,7 +3982,7 @@ int amdgpu_device_resume(struct drm_device *dev, >> bool fbcon) >>           return 0; >>       if (adev->in_s0ix) >> -        amdgpu_gfx_state_change_set(adev, sGpuChangeState_D0Entry); >> +        amdgpu_dpm_gfx_state_change(adev, sGpuChangeState_D0Entry); >>       /* post card */ >>       if (amdgpu_device_need_post(adev)) { >> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c >> b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c >> index 1916ec84dd71..3d8f82dc8c97 100644 >> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c >> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c >> @@ -615,7 +615,7 @@ int amdgpu_get_gfx_off_status(struct amdgpu_device >> *adev, uint32_t *value) >>       mutex_lock(&adev->gfx.gfx_off_mutex); >> -    r = smu_get_status_gfxoff(adev, value); >> +    r = amdgpu_dpm_get_status_gfxoff(adev, value); >>       mutex_unlock(&adev->gfx.gfx_off_mutex); >> @@ -852,19 +852,3 @@ int amdgpu_gfx_get_num_kcq(struct amdgpu_device >> *adev) >>       } >>       return amdgpu_num_kcq; >>   } >> - >> -/* amdgpu_gfx_state_change_set - Handle gfx power state change set >> - * @adev: amdgpu_device pointer >> - * @state: gfx power state(1 -sGpuChangeState_D0Entry and 2 >> -sGpuChangeState_D3Entry) >> - * >> - */ >> - >> -void amdgpu_gfx_state_change_set(struct amdgpu_device *adev, enum >> gfx_change_state state) >> -{ >> -    mutex_lock(&adev->pm.mutex); >> -    if (adev->powerplay.pp_funcs && >> -        adev->powerplay.pp_funcs->gfx_state_change_set) >> -        ((adev)->powerplay.pp_funcs->gfx_state_change_set( >> -            (adev)->powerplay.pp_handle, state)); >> -    mutex_unlock(&adev->pm.mutex); >> -} >> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h >> b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h >> index f851196c83a5..776c886fd94a 100644 >> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h >> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h >> @@ -47,12 +47,6 @@ enum amdgpu_gfx_pipe_priority { >>       AMDGPU_GFX_PIPE_PRIO_HIGH = AMDGPU_RING_PRIO_2 >>   }; >> -/* Argument for PPSMC_MSG_GpuChangeState */ >> -enum gfx_change_state { >> -    sGpuChangeState_D0Entry = 1, >> -    sGpuChangeState_D3Entry, >> -}; >> - >>   #define AMDGPU_GFX_QUEUE_PRIORITY_MINIMUM  0 >>   #define AMDGPU_GFX_QUEUE_PRIORITY_MAXIMUM  15 >> @@ -410,5 +404,4 @@ int amdgpu_gfx_cp_ecc_error_irq(struct >> amdgpu_device *adev, >>   uint32_t amdgpu_kiq_rreg(struct amdgpu_device *adev, uint32_t reg); >>   void amdgpu_kiq_wreg(struct amdgpu_device *adev, uint32_t reg, >> uint32_t v); >>   int amdgpu_gfx_get_num_kcq(struct amdgpu_device *adev); >> -void amdgpu_gfx_state_change_set(struct amdgpu_device *adev, enum >> gfx_change_state state); >>   #endif >> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c >> b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c >> index 3c623e589b79..35c4aec04a7e 100644 >> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c >> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c >> @@ -901,7 +901,7 @@ static void amdgpu_ras_get_ecc_info(struct >> amdgpu_device *adev, struct ras_err_d >>        * choosing right query method according to >>        * whether smu support query error information >>        */ >> -    ret = smu_get_ecc_info(&adev->smu, (void *)&(ras->umc_ecc)); >> +    ret = amdgpu_dpm_get_ecc_info(adev, (void *)&(ras->umc_ecc)); >>       if (ret == -EOPNOTSUPP) { >>           if (adev->umc.ras_funcs && >>               adev->umc.ras_funcs->query_ras_error_count) >> @@ -2132,8 +2132,7 @@ int amdgpu_ras_recovery_init(struct >> amdgpu_device *adev) >>           if (ret) >>               goto free; >> -        if (adev->smu.ppt_funcs && >> adev->smu.ppt_funcs->send_hbm_bad_pages_num) >> -            adev->smu.ppt_funcs->send_hbm_bad_pages_num(&adev->smu, >> con->eeprom_control.ras_num_recs); >> +        amdgpu_dpm_send_hbm_bad_pages_num(adev, >> con->eeprom_control.ras_num_recs); >>       } >>   #ifdef CONFIG_X86_MCE_AMD >> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c >> b/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c >> index 6e4bea012ea4..5fed26c8db44 100644 >> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c >> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c >> @@ -97,7 +97,7 @@ int amdgpu_umc_process_ras_data_cb(struct >> amdgpu_device *adev, >>       int ret = 0; >>       kgd2kfd_set_sram_ecc_flag(adev->kfd.dev); >> -    ret = smu_get_ecc_info(&adev->smu, (void *)&(con->umc_ecc)); >> +    ret = amdgpu_dpm_get_ecc_info(adev, (void *)&(con->umc_ecc)); >>       if (ret == -EOPNOTSUPP) { >>           if (adev->umc.ras_funcs && >>               adev->umc.ras_funcs->query_ras_error_count) >> @@ -160,8 +160,7 @@ int amdgpu_umc_process_ras_data_cb(struct >> amdgpu_device *adev, >>                           err_data->err_addr_cnt); >>               amdgpu_ras_save_bad_pages(adev); >> -            if (adev->smu.ppt_funcs && >> adev->smu.ppt_funcs->send_hbm_bad_pages_num) >> - >> adev->smu.ppt_funcs->send_hbm_bad_pages_num(&adev->smu, >> con->eeprom_control.ras_num_recs); >> +            amdgpu_dpm_send_hbm_bad_pages_num(adev, >> con->eeprom_control.ras_num_recs); >>           } >>           amdgpu_ras_reset_gpu(adev); >> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c >> b/drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c >> index deae12dc777d..329a4c89f1e6 100644 >> --- a/drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c >> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c >> @@ -222,7 +222,7 @@ void >> kfd_smi_event_update_thermal_throttling(struct kfd_dev *dev, >>       len = snprintf(fifo_in, sizeof(fifo_in), "%x %llx:%llx\n", >>                  KFD_SMI_EVENT_THERMAL_THROTTLE, throttle_bitmask, >> -               atomic64_read(&dev->adev->smu.throttle_int_counter)); >> +               amdgpu_dpm_get_thermal_throttling_counter(dev->adev)); >>       add_event_to_kfifo(dev, KFD_SMI_EVENT_THERMAL_THROTTLE, >> fifo_in, len); >>   } >> diff --git a/drivers/gpu/drm/amd/include/kgd_pp_interface.h >> b/drivers/gpu/drm/amd/include/kgd_pp_interface.h >> index 5c0867ebcfce..2e295facd086 100644 >> --- a/drivers/gpu/drm/amd/include/kgd_pp_interface.h >> +++ b/drivers/gpu/drm/amd/include/kgd_pp_interface.h >> @@ -26,6 +26,10 @@ >>   extern const struct amdgpu_ip_block_version pp_smu_ip_block; >> +enum smu_event_type { >> +    SMU_EVENT_RESET_COMPLETE = 0, >> +}; >> + >>   struct amd_vce_state { >>       /* vce clocks */ >>       u32 evclk; >> diff --git a/drivers/gpu/drm/amd/pm/amdgpu_dpm.c >> b/drivers/gpu/drm/amd/pm/amdgpu_dpm.c >> index 08362d506534..9b332c8a0079 100644 >> --- a/drivers/gpu/drm/amd/pm/amdgpu_dpm.c >> +++ b/drivers/gpu/drm/amd/pm/amdgpu_dpm.c >> @@ -1614,3 +1614,98 @@ int amdgpu_pm_load_smu_firmware(struct >> amdgpu_device *adev, uint32_t *smu_versio >>       return 0; >>   } >> + >> +int amdgpu_dpm_set_light_sbr(struct amdgpu_device *adev, bool enable) >> +{ >> +    return smu_set_light_sbr(&adev->smu, enable); >> +} >> + >> +int amdgpu_dpm_send_hbm_bad_pages_num(struct amdgpu_device *adev, >> uint32_t size) >> +{ >> +    int ret = 0; >> + >> +    if (adev->smu.ppt_funcs && >> adev->smu.ppt_funcs->send_hbm_bad_pages_num) >> +        ret = adev->smu.ppt_funcs->send_hbm_bad_pages_num(&adev->smu, >> size); >> + >> +    return ret; >> +} >> + >> +int amdgpu_dpm_get_dpm_freq_range(struct amdgpu_device *adev, >> +                  enum pp_clock_type type, >> +                  uint32_t *min, >> +                  uint32_t *max) >> +{ >> +    if (!is_support_sw_smu(adev)) >> +        return -EOPNOTSUPP; >> + >> +    switch (type) { >> +    case PP_SCLK: >> +        return smu_get_dpm_freq_range(&adev->smu, SMU_SCLK, min, max); >> +    default: >> +        return -EINVAL; >> +    } >> +} >> + >> +int amdgpu_dpm_set_soft_freq_range(struct amdgpu_device *adev, >> +                   enum pp_clock_type type, >> +                   uint32_t min, >> +                   uint32_t max) >> +{ >> +    if (!is_support_sw_smu(adev)) >> +        return -EOPNOTSUPP; >> + >> +    switch (type) { >> +    case PP_SCLK: >> +        return smu_set_soft_freq_range(&adev->smu, SMU_SCLK, min, max); >> +    default: >> +        return -EINVAL; >> +    } >> +} >> + >> +int amdgpu_dpm_wait_for_event(struct amdgpu_device *adev, >> +                  enum smu_event_type event, >> +                  uint64_t event_arg) >> +{ >> +    if (!is_support_sw_smu(adev)) >> +        return -EOPNOTSUPP; >> + >> +    return smu_wait_for_event(&adev->smu, event, event_arg); >> +} >> + >> +int amdgpu_dpm_get_status_gfxoff(struct amdgpu_device *adev, uint32_t >> *value) >> +{ >> +    if (!is_support_sw_smu(adev)) >> +        return -EOPNOTSUPP; >> + >> +    return smu_get_status_gfxoff(&adev->smu, value); >> +} >> + >> +uint64_t amdgpu_dpm_get_thermal_throttling_counter(struct >> amdgpu_device *adev) >> +{ >> +    return atomic64_read(&adev->smu.throttle_int_counter); >> +} >> + >> +/* amdgpu_dpm_gfx_state_change - Handle gfx power state change set >> + * @adev: amdgpu_device pointer >> + * @state: gfx power state(1 -sGpuChangeState_D0Entry and 2 >> -sGpuChangeState_D3Entry) >> + * >> + */ >> +void amdgpu_dpm_gfx_state_change(struct amdgpu_device *adev, >> +                 enum gfx_change_state state) >> +{ >> +    mutex_lock(&adev->pm.mutex); >> +    if (adev->powerplay.pp_funcs && >> +        adev->powerplay.pp_funcs->gfx_state_change_set) >> +        ((adev)->powerplay.pp_funcs->gfx_state_change_set( >> +            (adev)->powerplay.pp_handle, state)); >> +    mutex_unlock(&adev->pm.mutex); >> +} >> + >> +int amdgpu_dpm_get_ecc_info(struct amdgpu_device *adev, >> +                void *umc_ecc) >> +{ >> +    if (!is_support_sw_smu(adev)) >> +        return -EOPNOTSUPP; >> + > > In general, I don't think we need to keep this check everywhere to make > amdgpu_dpm_* backwards compatible.  The usage is also inconsistent. For > ex: amdgpu_dpm_get_thermal_throttling_counter doesn't have any > is_support_sw_smu check whereas amdgpu_dpm_get_ecc_info() has it. There > is no reason to keep adding is_support_sw_smu() check for every new > public API. For sure, they are not going to work with powerplay subsystem. > > I would rather prefer to leave old things and create amdgpu_smu_* for > anything which is supported only in smu subsystem. It's easier to read > from code perspective also - separate the ones which is supported by smu > component and not supported in older powerplay components. > > Only for the common ones that are supported in powerplay and smu, keep > amdgpu_dpm_*, for others preference would be to keep amdgpu_smu_*. > To add to the previous point - many of the new services offered by swsmu (ex: reset, i2c transfer, hbm ecc info etc.) are not even related to device power management, so it doesn't make sense to wrap it as dpm_ services. Thanks, Lijo > Thanks, > Lijo > >> +    return smu_get_ecc_info(&adev->smu, umc_ecc); >> +} >> diff --git a/drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h >> b/drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h >> index 16e3f72d31b9..7289d379a9fb 100644 >> --- a/drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h >> +++ b/drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h >> @@ -23,6 +23,12 @@ >>   #ifndef __AMDGPU_DPM_H__ >>   #define __AMDGPU_DPM_H__ >> +/* Argument for PPSMC_MSG_GpuChangeState */ >> +enum gfx_change_state { >> +    sGpuChangeState_D0Entry = 1, >> +    sGpuChangeState_D3Entry, >> +}; >> + >>   enum amdgpu_int_thermal_type { >>       THERMAL_TYPE_NONE, >>       THERMAL_TYPE_EXTERNAL, >> @@ -574,5 +580,22 @@ void amdgpu_dpm_enable_vce(struct amdgpu_device >> *adev, bool enable); >>   void amdgpu_dpm_enable_jpeg(struct amdgpu_device *adev, bool enable); >>   void amdgpu_pm_print_power_states(struct amdgpu_device *adev); >>   int amdgpu_pm_load_smu_firmware(struct amdgpu_device *adev, uint32_t >> *smu_version); >> - >> +int amdgpu_dpm_set_light_sbr(struct amdgpu_device *adev, bool enable); >> +int amdgpu_dpm_send_hbm_bad_pages_num(struct amdgpu_device *adev, >> uint32_t size); >> +int amdgpu_dpm_get_dpm_freq_range(struct amdgpu_device *adev, >> +                       enum pp_clock_type type, >> +                       uint32_t *min, >> +                       uint32_t *max); >> +int amdgpu_dpm_set_soft_freq_range(struct amdgpu_device *adev, >> +                        enum pp_clock_type type, >> +                        uint32_t min, >> +                        uint32_t max); >> +int amdgpu_dpm_wait_for_event(struct amdgpu_device *adev, enum >> smu_event_type event, >> +               uint64_t event_arg); >> +int amdgpu_dpm_get_status_gfxoff(struct amdgpu_device *adev, uint32_t >> *value); >> +uint64_t amdgpu_dpm_get_thermal_throttling_counter(struct >> amdgpu_device *adev); >> +void amdgpu_dpm_gfx_state_change(struct amdgpu_device *adev, >> +                 enum gfx_change_state state); >> +int amdgpu_dpm_get_ecc_info(struct amdgpu_device *adev, >> +                void *umc_ecc); >>   #endif >> diff --git a/drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h >> b/drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h >> index f738f7dc20c9..29791bb21fba 100644 >> --- a/drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h >> +++ b/drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h >> @@ -241,11 +241,6 @@ struct smu_user_dpm_profile { >>       uint32_t clk_dependency; >>   }; >> -enum smu_event_type { >> - >> -    SMU_EVENT_RESET_COMPLETE = 0, >> -}; >> - >>   #define SMU_TABLE_INIT(tables, table_id, s, a, d)    \ >>       do {                        \ >>           tables[table_id].size = s;        \ >> @@ -1412,11 +1407,11 @@ int smu_set_ac_dc(struct smu_context *smu); >>   int smu_allow_xgmi_power_down(struct smu_context *smu, bool en); >> -int smu_get_status_gfxoff(struct amdgpu_device *adev, uint32_t *value); >> +int smu_get_status_gfxoff(struct smu_context *smu, uint32_t *value); >>   int smu_set_light_sbr(struct smu_context *smu, bool enable); >> -int smu_wait_for_event(struct amdgpu_device *adev, enum >> smu_event_type event, >> +int smu_wait_for_event(struct smu_context *smu, enum smu_event_type >> event, >>                  uint64_t event_arg); >>   int smu_get_ecc_info(struct smu_context *smu, void *umc_ecc); >>   int smu_stb_collect_info(struct smu_context *smu, void *buff, >> uint32_t size); >> diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c >> b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c >> index 5839918cb574..ef7d0e377965 100644 >> --- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c >> +++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c >> @@ -100,17 +100,14 @@ static int smu_sys_set_pp_feature_mask(void >> *handle, >>       return ret; >>   } >> -int smu_get_status_gfxoff(struct amdgpu_device *adev, uint32_t *value) >> +int smu_get_status_gfxoff(struct smu_context *smu, uint32_t *value) >>   { >> -    int ret = 0; >> -    struct smu_context *smu = &adev->smu; >> +    if (!smu->ppt_funcs->get_gfx_off_status) >> +        return -EINVAL; >> -    if (is_support_sw_smu(adev) && smu->ppt_funcs->get_gfx_off_status) >> -        *value = smu_get_gfx_off_status(smu); >> -    else >> -        ret = -EINVAL; >> +    *value = smu_get_gfx_off_status(smu); >> -    return ret; >> +    return 0; >>   } >>   int smu_set_soft_freq_range(struct smu_context *smu, >> @@ -3167,11 +3164,10 @@ static const struct amd_pm_funcs >> swsmu_pm_funcs = { >>       .get_smu_prv_buf_details = smu_get_prv_buffer_details, >>   }; >> -int smu_wait_for_event(struct amdgpu_device *adev, enum >> smu_event_type event, >> +int smu_wait_for_event(struct smu_context *smu, enum smu_event_type >> event, >>                  uint64_t event_arg) >>   { >>       int ret = -EINVAL; >> -    struct smu_context *smu = &adev->smu; >>       if (smu->ppt_funcs->wait_for_event) { >>           mutex_lock(&smu->mutex); >>