Received: by 2002:a05:6a10:16a7:0:0:0:0 with SMTP id gp39csp800351pxb; Tue, 3 Nov 2020 12:54:28 -0800 (PST) X-Google-Smtp-Source: ABdhPJylFJwuO287hzef1Bo9Bdlcu8K19uoClrMuaCdQgjftKVkPwxwxQGb0eEj4rP6wZNmBO8Ve X-Received: by 2002:a17:906:2ddb:: with SMTP id h27mr16439401eji.213.1604436868355; Tue, 03 Nov 2020 12:54:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1604436868; cv=none; d=google.com; s=arc-20160816; b=u9SzxiLeQVA0zx0WUdS3VDUbcPQZKNnfnTt5n1M5uT8u6yzOQY/nLcuunJq/gZ7Kxr mjkh2ZIIfWkWCKCEgFT5stc+R87qFPql08sWnolv9QWULMFX46XBqr/C2jWHi8+pd4ih EpYruvx0sgw8B16SO9Si26yv0ZXyHIgtvPgsvdMDsLGSwtUZihdqCxw8c5Dnn7aJKEQH hznw+9IB8h7GQdE8N97AY4ATg/dr+rcI05DiVqCBKGBjc9e9FYWHSqznrRYPFvYZB6XK oD1I3/kqwhcVF46lqgvTqYHIn08/sBX8ag/VYEHxvZZlIqO3jpbpC2HQIuFkezjEOkKW urXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=xqUY7Ymnpzh5Z5iBmubVjksHYD7AvClv14/LhulzRIE=; b=m4IBcGGdO65J+yu7b/hIc9I7qVupf59cMh16GZbyX30PqSzPqngOJ38MbfEfyHXJjt Pk2xVMQd4Jie7SEBrUpHaTtybDmob0LEjiQwUxU8sddalkpLJGN35eXulS05oByob3b3 mCMA3W18tv9X6RrbuYziKkBMo0QcB1jyvZpwtOdiJL4cD8feV1n66ODH5FaY+f+HpdR0 a0KQnhf8CeOFV1tmcee2zDJzoH1eUWu/BMud25CdaNsjmjCm/bYUQ+2SV5DxRKDHI3G0 Qp6iaamR7livSR8SowqSWldgtAED6QU4C7dRqzT5vQv7E/qkWvkDGRJ8wp+xysXiLvQ8 JYWw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=StHAN0R7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id bd28si4546017edb.329.2020.11.03.12.54.04; Tue, 03 Nov 2020 12:54:28 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=StHAN0R7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731969AbgKCUv1 (ORCPT + 99 others); Tue, 3 Nov 2020 15:51:27 -0500 Received: from mail.kernel.org ([198.145.29.99]:46592 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731962AbgKCUv0 (ORCPT ); Tue, 3 Nov 2020 15:51:26 -0500 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 127C62053B; Tue, 3 Nov 2020 20:51:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604436685; bh=7kmNv4SiTGTm1wSPyzRwsQK/+GujU6foFuRTCmedvnM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=StHAN0R73C3OoJB7aJXG8PJD7vD/FuEAoOoHefG9KUffs/eIMVo1Brwrsb/2CUwMa EMEsSkYoDQTUV8p5KdEwU7kCqzDyxYQ4Nf95blyn5Ina1Svr1mKIJvBzOnpodMJx43 hgbu6ItuA2l9PRgmDdjlkUi4LR9NUsHvj1wB1cLo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kevin Wang , Likun Gao , Alex Deucher Subject: [PATCH 5.9 359/391] drm/amd/swsmu: add missing feature map for sienna_cichlid Date: Tue, 3 Nov 2020 21:36:50 +0100 Message-Id: <20201103203411.360376799@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201103203348.153465465@linuxfoundation.org> References: <20201103203348.153465465@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Kevin Wang commit d48d7484d8dca1d4577fc53f1f826e68420d00eb upstream. it will cause smu sysfs node of "pp_features" show error. Signed-off-by: Kevin Wang Reviewed-by: Likun Gao Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org # 5.9.x Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/powerplay/inc/smu_types.h | 1 + drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c | 3 +++ 2 files changed, 4 insertions(+) --- a/drivers/gpu/drm/amd/powerplay/inc/smu_types.h +++ b/drivers/gpu/drm/amd/powerplay/inc/smu_types.h @@ -217,6 +217,7 @@ enum smu_clk_type { __SMU_DUMMY_MAP(DPM_MP0CLK), \ __SMU_DUMMY_MAP(DPM_LINK), \ __SMU_DUMMY_MAP(DPM_DCEFCLK), \ + __SMU_DUMMY_MAP(DPM_XGMI), \ __SMU_DUMMY_MAP(DS_GFXCLK), \ __SMU_DUMMY_MAP(DS_SOCCLK), \ __SMU_DUMMY_MAP(DS_LCLK), \ --- a/drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c +++ b/drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c @@ -150,14 +150,17 @@ static struct cmn2asic_mapping sienna_ci FEA_MAP(DPM_GFXCLK), FEA_MAP(DPM_GFX_GPO), FEA_MAP(DPM_UCLK), + FEA_MAP(DPM_FCLK), FEA_MAP(DPM_SOCCLK), FEA_MAP(DPM_MP0CLK), FEA_MAP(DPM_LINK), FEA_MAP(DPM_DCEFCLK), + FEA_MAP(DPM_XGMI), FEA_MAP(MEM_VDDCI_SCALING), FEA_MAP(MEM_MVDD_SCALING), FEA_MAP(DS_GFXCLK), FEA_MAP(DS_SOCCLK), + FEA_MAP(DS_FCLK), FEA_MAP(DS_LCLK), FEA_MAP(DS_DCEFCLK), FEA_MAP(DS_UCLK),