FAILED: patch "[PATCH] drm/amd/powerplay: map mclk to fclk for COMBINATIONAL_BYPASS" failed to apply to 5.5-stable tree

FAILED: patch "[PATCH] drm/amd/powerplay: map mclk to fclk for COMBINATIONAL_BYPASS" failed to apply to 5.5-stable tree

[gregkh]

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 <stable@vger.kernel.org>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From ab65a371dd5f5cba6bd9a58a1a6d4115a71cc5c9 Mon Sep 17 00:00:00 2001
From: Prike Liang <Prike.Liang@amd.com>
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 <Prike.Liang@amd.com>
Reviewed-by: Evan Quan <evan.quan@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
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;

Re: FAILED: patch "[PATCH] drm/amd/powerplay: map mclk to fclk for COMBINATIONAL_BYPASS" failed to apply to 5.5-stable tree

[Sasha Levin]

On Mon, Mar 09, 2020 at 08:32:45PM +0100, gregkh@linuxfoundation.org wrote:
>
>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 <stable@vger.kernel.org>.
>
>thanks,
>
>greg k-h
>
>------------------ original commit in Linus's tree ------------------
>
>From ab65a371dd5f5cba6bd9a58a1a6d4115a71cc5c9 Mon Sep 17 00:00:00 2001
>From: Prike Liang <Prike.Liang@amd.com>
>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 <Prike.Liang@amd.com>
>Reviewed-by: Evan Quan <evan.quan@amd.com>
>Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
>Cc: stable@vger.kernel.org

Is it actually needed anywhere without 0b97bd6cde1d ("drm/amd/powerplay:
implement interface to retrieve clock freq for renoir")?

-- 
Thanks,
Sasha

RE: FAILED: patch "[PATCH] drm/amd/powerplay: map mclk to fclk for COMBINATIONAL_BYPASS" failed to apply to 5.5-stable tree

[Liang, Prike]

> -----Original Message-----
> From: Sasha Levin <sashal@kernel.org>
> Sent: Tuesday, March 10, 2020 8:28 AM
> To: gregkh@linuxfoundation.org
> Cc: Liang, Prike <Prike.Liang@amd.com>; Deucher, Alexander
> <Alexander.Deucher@amd.com>; Quan, Evan <Evan.Quan@amd.com>;
> stable@vger.kernel.org
> Subject: Re: FAILED: patch "[PATCH] drm/amd/powerplay: map mclk to fclk
> for COMBINATIONAL_BYPASS" failed to apply to 5.5-stable tree
> 
> On Mon, Mar 09, 2020 at 08:32:45PM +0100, gregkh@linuxfoundation.org
> wrote:
> >
> >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 <stable@vger.kernel.org>.
> >
> >thanks,
> >
> >greg k-h
> >
> >------------------ original commit in Linus's tree ------------------
> >
> >From ab65a371dd5f5cba6bd9a58a1a6d4115a71cc5c9 Mon Sep 17 00:00:00
> 2001
> >From: Prike Liang <Prike.Liang@amd.com>
> >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 <Prike.Liang@amd.com>
> >Reviewed-by: Evan Quan <evan.quan@amd.com>
> >Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
> >Cc: stable@vger.kernel.org
> 
> Is it actually needed anywhere without 0b97bd6cde1d
> ("drm/amd/powerplay:
> implement interface to retrieve clock freq for renoir")?
[Prike] Besides the read sensor interface for debugsfs of amdgpu_pm_info needed, 
the sysfs of pp_dpm_mclk also need the fix for mclk.  
> 
> --
> Thanks,
> Sasha