Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp3705925imu; Mon, 28 Jan 2019 09:21:06 -0800 (PST) X-Google-Smtp-Source: ALg8bN7mQySUHiZoHD7RNkR+63ite6/DC9e0+fMCCR4d6H6QqMFKQyl5SDwy+ZBx/3Kcip4k/hDS X-Received: by 2002:a62:cf02:: with SMTP id b2mr23470628pfg.183.1548696065968; Mon, 28 Jan 2019 09:21:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548696065; cv=none; d=google.com; s=arc-20160816; b=QgrF8GID2QWtDKl8IgbR1roCpNdUrfHf7JxZCwxUPbhyq7ogQqq7jXFXECoxNvn1Mf fATwVB2kA2ACN7J4KXTXPdLpVhL/lm4v77Qn0ExOBILIb4EIz8B50v97m1AM0WfL1h7G 0ZdHNiP/YTRXUXL+JEi9e3rmALm7g3q6gou7aeFVtBBavO3uIr6gqphs/WO+F7kJJNb3 nxSscmd0e0jSyRoBGubuVq9SG7frSFmfdHxj/I0fwwcHXYaip/RVsS+PafOqjlqLzfB2 RZHhYsIJTY818GmcQg0+M96g/rbBhsrQDtiBfZgnvPSP2d2nb8YwHpSsaeEqiuSzNJ8A gQyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=K5oVAlZOKCSbqAicDJuwyTS9ecJMtJeyP38geb8xkjc=; b=GisBE3MVGkFAL7kqLPiMoUhS49s0BMC3sRmiFmrIfGzknE8HRJajGM9G5I7G+J7H55 bWRCGa7OmCc+3UkjSV129Nz96OfPg4soLC8AsFkp95gExcn1kvemTAIInr/CVAzGq6Vt ON0wCgCk8nVootfCjqEhAvmMpgs3PTydCarV2arX5OwHVNlQm8Rua1Blq3vDp3wJhYpo 44ToISctBbCdztMjzWFM2kzwZwYI9YUV3sH/udxaAvGX2JYA1H7f88Ocp5HJ6sQlMSGG w8wE8sXioQ+/s9fGQfo7xVPLnI3NjGqmRjFYfPXBFXS9Umj4J7yOnDJaMOSbzpKYhVuZ zRDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=XRWFf8Xg; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a5si4782457pgg.120.2019.01.28.09.20.50; Mon, 28 Jan 2019 09:21:05 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=XRWFf8Xg; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731671AbfA1QEq (ORCPT + 99 others); Mon, 28 Jan 2019 11:04:46 -0500 Received: from mail.kernel.org ([198.145.29.99]:50578 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731622AbfA1QEo (ORCPT ); Mon, 28 Jan 2019 11:04:44 -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 D97E120989; Mon, 28 Jan 2019 16:04:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548691484; bh=x5X0/5mLknI9RzqoIF6XOvQEhkmyAJhzyN3ITStFYaM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XRWFf8XgSLg6FtfXmwpSzuDPtH0hd6SNRoweOzl/CdbOgtb3g77Nknjbcnw/HJriI Esoo6+381mrc/p+1h5Eo8rrr/HCHZlJANQJZkghAG+scyAnnYpG/0/76Lg0QqKufiY SpQPudOQuku6SSqVfkW1d0k6+pOsQca2FpL872ME= 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.19 109/258] drm/amdgpu/powerplay: fix clock stretcher limits on polaris (v2) Date: Mon, 28 Jan 2019 10:56:55 -0500 Message-Id: <20190128155924.51521-109-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190128155924.51521-1-sashal@kernel.org> References: <20190128155924.51521-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 5b67f575cd34..45629f26dbc2 100644 --- a/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c +++ b/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c @@ -1528,8 +1528,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