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 X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id ECC23C432C1 for ; Tue, 24 Sep 2019 17:01:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B4FD5214AF for ; Tue, 24 Sep 2019 17:01:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569344462; bh=0QVKQtbYTzc53uwo95bKg2rV7mwigxbBZrR2N+aprkk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=oU/BCA8qGb/blK4jJkmE6zVbzyhYqr/wp74oUZ2A7RWqfRzcawObLAhrKg2iSxKjA m8z66unUF8i3Zu3ZdfZfQDI7rJwySkFif+EYi3LqVIvMcxW2nlkG3TI9z9VnDNJRmH HgTvAShoNryCsB3NxQtEIXykwyf5LRxl0vblHX3M= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2633183AbfIXQoc (ORCPT ); Tue, 24 Sep 2019 12:44:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:33574 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2633170AbfIXQo2 (ORCPT ); Tue, 24 Sep 2019 12:44:28 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 003A121783; Tue, 24 Sep 2019 16:44:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569343467; bh=0QVKQtbYTzc53uwo95bKg2rV7mwigxbBZrR2N+aprkk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=k6kANdGBLF7IZyE2XaSxhP8zjjK+1sjLAqmbd1HcDHlXCEn41AhMqjMdl6iEaMw1B JU7g4XLUSSHck+K2hoktykfKVJfmDo+llHhr+lKcYbpaByoGv5Pj3xP5i6wGg1YTan zw+YYH8TQwy/X3j8auhgJp4Q2GgNfhjB8ejGaUBw= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Kevin Wang , Evan Quan , Alex Deucher , Sasha Levin , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.3 60/87] drm/amd/powerpaly: fix navi series custom peak level value error Date: Tue, 24 Sep 2019 12:41:16 -0400 Message-Id: <20190924164144.25591-60-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190924164144.25591-1-sashal@kernel.org> References: <20190924164144.25591-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Kevin Wang [ Upstream commit 706feb26f890e1b8297b5d14975160de361edf4f ] fix other navi asic set peak performance level error. because the navi10_ppt.c will handle navi12 14 asic, it will use navi10 peak value to set other asic, it is not correct. after patch: only navi10 use custom peak value, other asic will used default value. Signed-off-by: Kevin Wang Reviewed-by: Evan Quan Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c b/drivers/gpu/drm/amd/powerplay/navi10_ppt.c index b81c7e715dc94..9aaf2deff6e94 100644 --- a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c +++ b/drivers/gpu/drm/amd/powerplay/navi10_ppt.c @@ -1627,6 +1627,10 @@ static int navi10_set_peak_clock_by_device(struct smu_context *smu) static int navi10_set_performance_level(struct smu_context *smu, enum amd_dpm_forced_level level) { int ret = 0; + struct amdgpu_device *adev = smu->adev; + + if (adev->asic_type != CHIP_NAVI10) + return -EINVAL; switch (level) { case AMD_DPM_FORCED_LEVEL_PROFILE_PEAK: -- 2.20.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 5.3 60/87] drm/amd/powerpaly: fix navi series custom peak level value error Date: Tue, 24 Sep 2019 12:41:16 -0400 Message-ID: <20190924164144.25591-60-sashal@kernel.org> References: <20190924164144.25591-1-sashal@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190924164144.25591-1-sashal-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: Sasha Levin , Kevin Wang , dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, Alex Deucher , Evan Quan List-Id: dri-devel@lists.freedesktop.org RnJvbTogS2V2aW4gV2FuZyA8a2V2aW4xLndhbmdAYW1kLmNvbT4KClsgVXBzdHJlYW0gY29tbWl0 IDcwNmZlYjI2Zjg5MGUxYjgyOTdiNWQxNDk3NTE2MGRlMzYxZWRmNGYgXQoKZml4IG90aGVyIG5h dmkgYXNpYyBzZXQgcGVhayBwZXJmb3JtYW5jZSBsZXZlbCBlcnJvci4KYmVjYXVzZSB0aGUgbmF2 aTEwX3BwdC5jIHdpbGwgaGFuZGxlIG5hdmkxMiAxNCBhc2ljLAppdCB3aWxsIHVzZSBuYXZpMTAg cGVhayB2YWx1ZSB0byBzZXQgb3RoZXIgYXNpYywgaXQgaXMgbm90IGNvcnJlY3QuCgphZnRlciBw YXRjaDoKb25seSBuYXZpMTAgdXNlIGN1c3RvbSBwZWFrIHZhbHVlLCBvdGhlciBhc2ljIHdpbGwg dXNlZCBkZWZhdWx0IHZhbHVlLgoKU2lnbmVkLW9mZi1ieTogS2V2aW4gV2FuZyA8a2V2aW4xLndh bmdAYW1kLmNvbT4KUmV2aWV3ZWQtYnk6IEV2YW4gUXVhbiA8ZXZhbi5xdWFuQGFtZC5jb20+ClNp Z25lZC1vZmYtYnk6IEFsZXggRGV1Y2hlciA8YWxleGFuZGVyLmRldWNoZXJAYW1kLmNvbT4KU2ln bmVkLW9mZi1ieTogU2FzaGEgTGV2aW4gPHNhc2hhbEBrZXJuZWwub3JnPgotLS0KIGRyaXZlcnMv Z3B1L2RybS9hbWQvcG93ZXJwbGF5L25hdmkxMF9wcHQuYyB8IDQgKysrKwogMSBmaWxlIGNoYW5n ZWQsIDQgaW5zZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvcG93 ZXJwbGF5L25hdmkxMF9wcHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvcG93ZXJwbGF5L25hdmkx MF9wcHQuYwppbmRleCBiODFjN2U3MTVkYzk0Li45YWFmMmRlZmY2ZTk0IDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vYW1kL3Bvd2VycGxheS9uYXZpMTBfcHB0LmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2FtZC9wb3dlcnBsYXkvbmF2aTEwX3BwdC5jCkBAIC0xNjI3LDYgKzE2MjcsMTAgQEAg c3RhdGljIGludCBuYXZpMTBfc2V0X3BlYWtfY2xvY2tfYnlfZGV2aWNlKHN0cnVjdCBzbXVfY29u dGV4dCAqc211KQogc3RhdGljIGludCBuYXZpMTBfc2V0X3BlcmZvcm1hbmNlX2xldmVsKHN0cnVj dCBzbXVfY29udGV4dCAqc211LCBlbnVtIGFtZF9kcG1fZm9yY2VkX2xldmVsIGxldmVsKQogewog CWludCByZXQgPSAwOworCXN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2ID0gc211LT5hZGV2Owor CisJaWYgKGFkZXYtPmFzaWNfdHlwZSAhPSBDSElQX05BVkkxMCkKKwkJcmV0dXJuIC1FSU5WQUw7 CiAKIAlzd2l0Y2ggKGxldmVsKSB7CiAJY2FzZSBBTURfRFBNX0ZPUkNFRF9MRVZFTF9QUk9GSUxF X1BFQUs6Ci0tIAoyLjIwLjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCmFtZC1nZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vYW1kLWdm eA==