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.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham 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 CC5EFC10F25 for ; Mon, 9 Mar 2020 19:32:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A6C5A2465A for ; Mon, 9 Mar 2020 19:32:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583782368; bh=2BwiSVyEViFfE4XXSlYCVLwTIYo5TPggKWl7gV2wQ8A=; h=Subject:To:Cc:From:Date:List-ID:From; b=XWSi+GGTnnFjLeIH2UNo1uH2e5vaxtTa0uG00S2ss623LeTYyqQcswqvtABGfkeG4 a9djlz75EkJkDNyGv/99aplISutaFOJjSVZtUajOk2z+u/SXBKOirmTSreJPReuUuO hWRuhVkzJYQ7mPjlk4JuyCbjjLjcEKG6XsoQFHuQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726157AbgCITcs (ORCPT ); Mon, 9 Mar 2020 15:32:48 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:47413 "EHLO out2-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726121AbgCITcs (ORCPT ); Mon, 9 Mar 2020 15:32:48 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 9002B21FEB; Mon, 9 Mar 2020 15:32:47 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Mon, 09 Mar 2020 15:32:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=J0ul29 ax70fq35Etcx2wDIufIwu862NfRcdMg6gZWVM=; b=b67nyyEHsW7ryMwxQCYKg5 YunLjEH2WsrOHan0CSseTbNp0R7f8Az4eAqrKOGwaTIZZTGLEkajEqKLIZiHWW4v vzDlINfQ8O4CnXmTjku8glmCx4y7T/8R0cD4C28aVutBOdhzctd5zpeOZ48bguzu IR+1bVDAnt3r9I9nwE8rqTQ19/l8xtoV8fSzdw5iPWmDJo0i+YJP7bm1u6/9+RsP JxGkSroFW73bVdjEUo66bP1a2QSYFf8GF5LdEzNhHJQmSQvVr0UUthEcjLfaXi0p 7r35ZVa6m52gP/BAWa8Zc5etT2MESs9F0oOtGK0yTgTu4Sy3vMc3lDNWaybKUrzQ == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedugedruddukedguddviecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhepuffvhfffkfggtgfgsehtkeertd dttdflnecuhfhrohhmpeeoghhrvghgkhhhsehlihhnuhigfhhouhhnuggrthhiohhnrdho rhhgqeenucfkphepkeefrdekiedrkeelrddutdejnecuvehluhhsthgvrhfuihiivgeptd enucfrrghrrghmpehmrghilhhfrhhomhepghhrvghgsehkrhhorghhrdgtohhm X-ME-Proxy: Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) by mail.messagingengine.com (Postfix) with ESMTPA id C354C3280065; Mon, 9 Mar 2020 15:32:46 -0400 (EDT) Subject: FAILED: patch "[PATCH] drm/amd/powerplay: map mclk to fclk for COMBINATIONAL_BYPASS" failed to apply to 5.5-stable tree To: Prike.Liang@amd.com, alexander.deucher@amd.com, evan.quan@amd.com Cc: From: Date: Mon, 09 Mar 2020 20:32:45 +0100 Message-ID: <158378236575229@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 5.5-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From ab65a371dd5f5cba6bd9a58a1a6d4115a71cc5c9 Mon Sep 17 00:00:00 2001 From: Prike Liang Date: Wed, 4 Mar 2020 10:36:21 +0800 Subject: [PATCH] drm/amd/powerplay: map mclk to fclk for COMBINATIONAL_BYPASS case When hit COMBINATIONAL_BYPASS the mclk will be bypass and can export fclk frequency to user usage. Signed-off-by: Prike Liang Reviewed-by: Evan Quan Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org diff --git a/drivers/gpu/drm/amd/powerplay/renoir_ppt.c b/drivers/gpu/drm/amd/powerplay/renoir_ppt.c index 861e6410363b..568c041c2206 100644 --- a/drivers/gpu/drm/amd/powerplay/renoir_ppt.c +++ b/drivers/gpu/drm/amd/powerplay/renoir_ppt.c @@ -111,8 +111,8 @@ static struct smu_12_0_cmn2aisc_mapping renoir_clk_map[SMU_CLK_COUNT] = { CLK_MAP(GFXCLK, CLOCK_GFXCLK), CLK_MAP(SCLK, CLOCK_GFXCLK), CLK_MAP(SOCCLK, CLOCK_SOCCLK), - CLK_MAP(UCLK, CLOCK_UMCCLK), - CLK_MAP(MCLK, CLOCK_UMCCLK), + CLK_MAP(UCLK, CLOCK_FCLK), + CLK_MAP(MCLK, CLOCK_FCLK), }; static struct smu_12_0_cmn2aisc_mapping renoir_table_map[SMU_TABLE_COUNT] = { @@ -280,7 +280,7 @@ static int renoir_print_clk_levels(struct smu_context *smu, break; case SMU_MCLK: count = NUM_MEMCLK_DPM_LEVELS; - cur_value = metrics.ClockFrequency[CLOCK_UMCCLK]; + cur_value = metrics.ClockFrequency[CLOCK_FCLK]; break; case SMU_DCEFCLK: count = NUM_DCFCLK_DPM_LEVELS;