Received: by 2002:a05:6a10:1d13:0:0:0:0 with SMTP id pp19csp1010432pxb; Wed, 1 Sep 2021 15:12:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwhWwuEBsqgP4Yn49hXvmfuNfI9K18+GONpMbbbPIJ6RyjEde7QStkAF5GLx7ksEMSFM7ZJ X-Received: by 2002:a17:906:25d7:: with SMTP id n23mr77919ejb.322.1630534362302; Wed, 01 Sep 2021 15:12:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630534362; cv=none; d=google.com; s=arc-20160816; b=ll8biJlI26Fno3uO85mg81CYccR2KPnkBQZtpg3UsWGNMfhR3dHdhshl4wqi/64pCo RK2UT2wbhlltP2ssNsC3SbXlQZIpn4jxYqLEGuxOvTe1M/rOm1RaDhvugEw9UCe+aWg5 4pGtnLVS5DuNgYWLBwwLY7WzFL6kxdUVmGsNIXsbSV5dgQYjQOWiqpCGlBATttHh4KvC sY2frLruXjDjKQJopz8FoCuYwl4Jiskk+N1BwTvCaXxOiztl0Hj2M6jKK8gSc80VGAr1 KGShxWBWfK8KgQuK6te131c8Gm2kaMiHbFuh0awbgtlKKWaZ6zSFFFuog4scynmmevfb Szyg== 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=x5vER9niYSfsOEKpACAlp70lNNcxNLTnbAWeOWvgfl4=; b=lN3Rp72Y1koPC3m1HPIT/DslL1pcZAguPZgx04s7wBM27NzCDtfI+TvnheLXc76qlL 8Aa9CFzRfaKcMKWPmfixw+9G5C04dQCJ83wWhHJjgEGstdzQnOrpARsapBJxLzqq3Hea D2DWk3WsTTEnFlPlhDOCCLpCTQMEFrKDoDCWjVaVtbBAsLTxi3iwKOHiiTfsW+tb5MwM vgrGG97MIYtFXZVgvnwItoWrEE6TZG/47S/wh9sWXSsL3VbO3LKcfbjuf8DL2TdPo1DN o0vTixrnPwRXcu5k8sss9anziyOEItqQTsWzEHrWESdwuq2WdbNLVfCvbHRwi63X+1E4 ecwA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=vCtC0Ajp; 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=pass (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 y9si33007edr.413.2021.09.01.15.12.12; Wed, 01 Sep 2021 15:12:42 -0700 (PDT) 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=@linuxfoundation.org header.s=korg header.b=vCtC0Ajp; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346117AbhIAMwk (ORCPT + 99 others); Wed, 1 Sep 2021 08:52:40 -0400 Received: from mail.kernel.org ([198.145.29.99]:53770 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345862AbhIAMsp (ORCPT ); Wed, 1 Sep 2021 08:48:45 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4725E61058; Wed, 1 Sep 2021 12:41:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1630500063; bh=mSWfygBrAcGHiHALaFXdKb5REgofNVKcLCC4LuP8yU0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vCtC0AjpGF5MIfBZ1aADWhJINO1N+vz1AmVWN0m1g8EHW2AfIlT/M1geOgbJKcJTf 8h1NHKZ+P4z4qHePrtCJxu98PQ2l5jm/V9hvSn1DBoBpUe25nl97ohjiG42IIzal+s gGmfH7Sx7Jh6wtLNx5ORtpGJcYG6gU6saTSb5/W0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kenneth Feng , Hawking Zhang , Alex Deucher , Sasha Levin Subject: [PATCH 5.13 088/113] drm/amd/pm: change the workload type for some cards Date: Wed, 1 Sep 2021 14:28:43 +0200 Message-Id: <20210901122304.909643023@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210901122301.984263453@linuxfoundation.org> References: <20210901122301.984263453@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: Kenneth Feng [ Upstream commit 93c5701b00d50d192ce2247cb10d6c0b3fe25cd8 ] change the workload type for some cards as it is needed. Signed-off-by: Kenneth Feng Reviewed-by: Hawking Zhang Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c index f5a32654cde7..cc6f19a48dea 100644 --- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c +++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c @@ -5123,6 +5123,13 @@ static int vega10_get_power_profile_mode(struct pp_hwmgr *hwmgr, char *buf) return size; } +static bool vega10_get_power_profile_mode_quirks(struct pp_hwmgr *hwmgr) +{ + struct amdgpu_device *adev = hwmgr->adev; + + return (adev->pdev->device == 0x6860); +} + static int vega10_set_power_profile_mode(struct pp_hwmgr *hwmgr, long *input, uint32_t size) { struct vega10_hwmgr *data = hwmgr->backend; @@ -5159,9 +5166,15 @@ static int vega10_set_power_profile_mode(struct pp_hwmgr *hwmgr, long *input, ui } out: - smum_send_msg_to_smc_with_parameter(hwmgr, PPSMC_MSG_SetWorkloadMask, + if (vega10_get_power_profile_mode_quirks(hwmgr)) + smum_send_msg_to_smc_with_parameter(hwmgr, PPSMC_MSG_SetWorkloadMask, 1 << power_profile_mode, NULL); + else + smum_send_msg_to_smc_with_parameter(hwmgr, PPSMC_MSG_SetWorkloadMask, + (!power_profile_mode) ? 0 : 1 << (power_profile_mode - 1), + NULL); + hwmgr->power_profile_mode = power_profile_mode; return 0; -- 2.30.2