From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 4.20 129/304] drm/amdgpu/powerplay: fix clock stretcher limits on polaris (v2) Date: Mon, 28 Jan 2019 10:40:46 -0500 Message-ID: <20190128154341.47195-129-sashal@kernel.org> References: <20190128154341.47195-1-sashal@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190128154341.47195-1-sashal-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> List-Id: Discussion list for AMD gfx 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: Alex Deucher , Sasha Levin , dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org RnJvbTogQWxleCBEZXVjaGVyIDxhbGV4YW5kZXIuZGV1Y2hlckBhbWQuY29tPgoKWyBVcHN0cmVh bSBjb21taXQgZGU0YWFhYjVjYzk3NzBhOGM0ZGMxM2Q5YmZiNmE4M2IwNmJiYTU3ZSBdCgpBZGp1 c3QgbGltaXRzIGZvciBuZXdlciBwb2xhcmlzIHZhcmlhbnRzLgoKdjI6IGZpeCBwb2xhcmlzMTEg a2lja2VyIChKZXJyeSkKClJldmlld2VkLWJ5OiBKdW53ZWkgWmhhbmcgPEplcnJ5LlpoYW5nQGFt ZC5jb20+ClNpZ25lZC1vZmYtYnk6IEFsZXggRGV1Y2hlciA8YWxleGFuZGVyLmRldWNoZXJAYW1k LmNvbT4KU2lnbmVkLW9mZi1ieTogU2FzaGEgTGV2aW4gPHNhc2hhbEBrZXJuZWwub3JnPgotLS0K IC4uLi9kcm0vYW1kL3Bvd2VycGxheS9zbXVtZ3IvcG9sYXJpczEwX3NtdW1nci5jIHwgMTcgKysr KysrKysrKysrKysrLS0KIDEgZmlsZSBjaGFuZ2VkLCAxNSBpbnNlcnRpb25zKCspLCAyIGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvcG93ZXJwbGF5L3NtdW1n ci9wb2xhcmlzMTBfc211bWdyLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL3Bvd2VycGxheS9zbXVt Z3IvcG9sYXJpczEwX3NtdW1nci5jCmluZGV4IGExZTBhYzlhZTI0OC4uOTBjMTIxNWM2ZjVlIDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL3Bvd2VycGxheS9zbXVtZ3IvcG9sYXJpczEw X3NtdW1nci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvcG93ZXJwbGF5L3NtdW1nci9wb2xh cmlzMTBfc211bWdyLmMKQEAgLTE1MjksOCArMTUyOSwyMSBAQCBzdGF0aWMgaW50IHBvbGFyaXMx MF9wb3B1bGF0ZV9jbG9ja19zdHJldGNoZXJfZGF0YV90YWJsZShzdHJ1Y3QgcHBfaHdtZ3IgKmh3 bWdyKQogCWVmdXNlID0gZWZ1c2UgPj4gMjQ7CiAKIAlpZiAoaHdtZ3ItPmNoaXBfaWQgPT0gQ0hJ UF9QT0xBUklTMTApIHsKLQkJbWluID0gMTAwMDsKLQkJbWF4ID0gMjMwMDsKKwkJaWYgKGh3bWdy LT5pc19raWNrZXIpIHsKKwkJCW1pbiA9IDEyMDA7CisJCQltYXggPSAyNTAwOworCQl9IGVsc2Ug eworCQkJbWluID0gMTAwMDsKKwkJCW1heCA9IDIzMDA7CisJCX0KKwl9IGVsc2UgaWYgKGh3bWdy LT5jaGlwX2lkID09IENISVBfUE9MQVJJUzExKSB7CisJCWlmIChod21nci0+aXNfa2lja2VyKSB7 CisJCQltaW4gPSA5MDA7CisJCQltYXggPSAyMTAwOworCQl9IGVsc2UgeworCQkJbWluID0gMTEw MDsKKwkJCW1heCA9IDIxMDA7CisJCX0KIAl9IGVsc2UgewogCQltaW4gPSAxMTAwOwogCQltYXgg PSAyMTAwOwotLSAKMi4xOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2FtZC1n ZngK 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=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,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 AE924C282C8 for ; Mon, 28 Jan 2019 15:49:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7AD092147A for ; Mon, 28 Jan 2019 15:49:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548690581; bh=gZa6UeXQHFwi6vSETxcA+9BdDbuST0+PhsiaVqFdxAE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=R7qxhVCo0paRlvpgEkaWTw6h0wpi7WOQbu34mw5FC0sQY95sDVlDH8bo9JQfbLWDr qX3yOB/uEeC0lUZogjhhRSdtesYyrOJvBP1azetupW2Vwseqx1zCsC65wOrhNwrFqB qXICooiZRTaYW6NoHrKL3PEDA6bwiMz/QNtNVwqM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728740AbfA1Ptk (ORCPT ); Mon, 28 Jan 2019 10:49:40 -0500 Received: from mail.kernel.org ([198.145.29.99]:35416 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727935AbfA1Pth (ORCPT ); Mon, 28 Jan 2019 10:49:37 -0500 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 2150C2147A; Mon, 28 Jan 2019 15:49:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548690577; bh=gZa6UeXQHFwi6vSETxcA+9BdDbuST0+PhsiaVqFdxAE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aj8HMnhBIl1ym9lZ9+uDPJsgZovVxy+DslzoDTCqH32g9xEnvg921efpDrk9a2sHB 9Awt5yt47zkha1EzifVWx4qIEz/7M3Vy8pNRCIjdotQztS2MRbl7d4uGqkD3ZlZyqE spzCufNMQoVP/j/hTFz34fb0J3B8pph8vaJXMELA= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Alex Deucher , Sasha Levin , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 4.20 129/304] drm/amdgpu/powerplay: fix clock stretcher limits on polaris (v2) Date: Mon, 28 Jan 2019 10:40:46 -0500 Message-Id: <20190128154341.47195-129-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190128154341.47195-1-sashal@kernel.org> References: <20190128154341.47195-1-sashal@kernel.org> MIME-Version: 1.0 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: Alex Deucher [ Upstream commit de4aaab5cc9770a8c4dc13d9bfb6a83b06bba57e ] Adjust limits for newer polaris variants. v2: fix polaris11 kicker (Jerry) Reviewed-by: Junwei Zhang Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- .../drm/amd/powerplay/smumgr/polaris10_smumgr.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c index a1e0ac9ae248..90c1215c6f5e 100644 --- a/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c +++ b/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c @@ -1529,8 +1529,21 @@ static int polaris10_populate_clock_stretcher_data_table(struct pp_hwmgr *hwmgr) efuse = efuse >> 24; if (hwmgr->chip_id == CHIP_POLARIS10) { - min = 1000; - max = 2300; + if (hwmgr->is_kicker) { + min = 1200; + max = 2500; + } else { + min = 1000; + max = 2300; + } + } else if (hwmgr->chip_id == CHIP_POLARIS11) { + if (hwmgr->is_kicker) { + min = 900; + max = 2100; + } else { + min = 1100; + max = 2100; + } } else { min = 1100; max = 2100; -- 2.19.1