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=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 8F076C43381 for ; Fri, 22 Mar 2019 12:37:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 550642070D for ; Fri, 22 Mar 2019 12:37:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553258223; bh=62/noK9bNF3XffbKIu+qsy1LCWd1oY/kqjuNqFFUcqo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=yFNlFlQJJZ0xui3WYSeQDA4/oYPEsUFf72g2R/0alaHs9prnPQp8/00OFkBM3mMTR 4NK8W9362E76bJeyoOe7mJ2qsKWdTpFtCbzKyhiKoomt8g7bgPePPNsFVGniIZO+8W WV5xo/CqdMF4HBilJ0+mI9EFWCcASJZPv17vGvU8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388615AbfCVMKb (ORCPT ); Fri, 22 Mar 2019 08:10:31 -0400 Received: from mail.kernel.org ([198.145.29.99]:48940 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732132AbfCVMKa (ORCPT ); Fri, 22 Mar 2019 08:10:30 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 6E2602083D; Fri, 22 Mar 2019 12:10:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553256629; bh=62/noK9bNF3XffbKIu+qsy1LCWd1oY/kqjuNqFFUcqo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XSgoIMhKTRD33IXK60mPjxrJt3dA9OIAq/fkX+AAvMHlX3FHZu+j1Q00ZfOcG2V/1 fEodOhf1fzKCMLaywfG0vm6lDBEfouwOQPE07M6iQeU7CsdcxTX8Qv5gfEZJ8tLwt9 1qRLLQNMUVhIR0/txo90dLuw9VWs8X/ZLX6o+ugw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Evan Quan , Feifei Xu , Alex Deucher Subject: [PATCH 4.19 271/280] drm/amd/powerplay: correct power reading on fiji Date: Fri, 22 Mar 2019 12:17:04 +0100 Message-Id: <20190322111346.140431167@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190322111306.356185024@linuxfoundation.org> References: <20190322111306.356185024@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ From: Evan Quan commit f5742ec36422a39b57f0256e4847f61b3c432f8c upstream. Set sampling period as 500ms to provide a smooth power reading output. Also, correct the register for power reading. Signed-off-by: Evan Quan Reviewed-by: Feifei Xu Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c @@ -3487,14 +3487,14 @@ static int smu7_get_gpu_power(struct pp_ smum_send_msg_to_smc(hwmgr, PPSMC_MSG_PmStatusLogStart); cgs_write_ind_register(hwmgr->device, CGS_IND_REG__SMC, - ixSMU_PM_STATUS_94, 0); + ixSMU_PM_STATUS_95, 0); for (i = 0; i < 10; i++) { - mdelay(1); + mdelay(500); smum_send_msg_to_smc(hwmgr, PPSMC_MSG_PmStatusLogSample); tmp = cgs_read_ind_register(hwmgr->device, CGS_IND_REG__SMC, - ixSMU_PM_STATUS_94); + ixSMU_PM_STATUS_95); if (tmp != 0) break; }