[PATCH] Revert "drm/amd/pm: correct the workload setting"

[PATCH] Revert "drm/amd/pm: correct the workload setting"

[Alex Deucher]

This reverts commit 4a18810d0b6fb2b853b75d21117040a783f2ab66.

This causes a regression in the workload selection.
A more extensive fix is being worked on for mainline.
For stable, revert.

Link: https://gitlab.freedesktop.org/drm/amd/-/issues/3618
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org # 6.11.x
---
 drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c     | 49 ++++++-------------
 drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h |  4 +-
 .../gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c |  5 +-
 .../gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c   |  5 +-
 .../amd/pm/swsmu/smu11/sienna_cichlid_ppt.c   |  5 +-
 .../gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c  |  4 +-
 .../gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c   |  4 +-
 .../drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c  | 20 ++------
 .../drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c  |  5 +-
 .../drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c  |  9 ++--
 drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c        |  8 ---
 drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h        |  2 -
 12 files changed, 36 insertions(+), 84 deletions(-)

diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
index ee1bcfaae3e3..80e60ea2d11e 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
@@ -1259,33 +1259,26 @@ static int smu_sw_init(void *handle)
 	smu->watermarks_bitmap = 0;
 	smu->power_profile_mode = PP_SMC_POWER_PROFILE_BOOTUP_DEFAULT;
 	smu->default_power_profile_mode = PP_SMC_POWER_PROFILE_BOOTUP_DEFAULT;
-	smu->user_dpm_profile.user_workload_mask = 0;
 
 	atomic_set(&smu->smu_power.power_gate.vcn_gated, 1);
 	atomic_set(&smu->smu_power.power_gate.jpeg_gated, 1);
 	atomic_set(&smu->smu_power.power_gate.vpe_gated, 1);
 	atomic_set(&smu->smu_power.power_gate.umsch_mm_gated, 1);
 
-	smu->workload_priority[PP_SMC_POWER_PROFILE_BOOTUP_DEFAULT] = 0;
-	smu->workload_priority[PP_SMC_POWER_PROFILE_FULLSCREEN3D] = 1;
-	smu->workload_priority[PP_SMC_POWER_PROFILE_POWERSAVING] = 2;
-	smu->workload_priority[PP_SMC_POWER_PROFILE_VIDEO] = 3;
-	smu->workload_priority[PP_SMC_POWER_PROFILE_VR] = 4;
-	smu->workload_priority[PP_SMC_POWER_PROFILE_COMPUTE] = 5;
-	smu->workload_priority[PP_SMC_POWER_PROFILE_CUSTOM] = 6;
+	smu->workload_prority[PP_SMC_POWER_PROFILE_BOOTUP_DEFAULT] = 0;
+	smu->workload_prority[PP_SMC_POWER_PROFILE_FULLSCREEN3D] = 1;
+	smu->workload_prority[PP_SMC_POWER_PROFILE_POWERSAVING] = 2;
+	smu->workload_prority[PP_SMC_POWER_PROFILE_VIDEO] = 3;
+	smu->workload_prority[PP_SMC_POWER_PROFILE_VR] = 4;
+	smu->workload_prority[PP_SMC_POWER_PROFILE_COMPUTE] = 5;
+	smu->workload_prority[PP_SMC_POWER_PROFILE_CUSTOM] = 6;
 
 	if (smu->is_apu ||
-	    !smu_is_workload_profile_available(smu, PP_SMC_POWER_PROFILE_FULLSCREEN3D)) {
-		smu->driver_workload_mask =
-			1 << smu->workload_priority[PP_SMC_POWER_PROFILE_BOOTUP_DEFAULT];
-	} else {
-		smu->driver_workload_mask =
-			1 << smu->workload_priority[PP_SMC_POWER_PROFILE_FULLSCREEN3D];
-		smu->default_power_profile_mode = PP_SMC_POWER_PROFILE_FULLSCREEN3D;
-	}
+	    !smu_is_workload_profile_available(smu, PP_SMC_POWER_PROFILE_FULLSCREEN3D))
+		smu->workload_mask = 1 << smu->workload_prority[PP_SMC_POWER_PROFILE_BOOTUP_DEFAULT];
+	else
+		smu->workload_mask = 1 << smu->workload_prority[PP_SMC_POWER_PROFILE_FULLSCREEN3D];
 
-	smu->workload_mask = smu->driver_workload_mask |
-							smu->user_dpm_profile.user_workload_mask;
 	smu->workload_setting[0] = PP_SMC_POWER_PROFILE_BOOTUP_DEFAULT;
 	smu->workload_setting[1] = PP_SMC_POWER_PROFILE_FULLSCREEN3D;
 	smu->workload_setting[2] = PP_SMC_POWER_PROFILE_POWERSAVING;
@@ -2355,20 +2348,17 @@ static int smu_switch_power_profile(void *handle,
 		return -EINVAL;
 
 	if (!en) {
-		smu->driver_workload_mask &= ~(1 << smu->workload_priority[type]);
+		smu->workload_mask &= ~(1 << smu->workload_prority[type]);
 		index = fls(smu->workload_mask);
 		index = index > 0 && index <= WORKLOAD_POLICY_MAX ? index - 1 : 0;
 		workload[0] = smu->workload_setting[index];
 	} else {
-		smu->driver_workload_mask |= (1 << smu->workload_priority[type]);
+		smu->workload_mask |= (1 << smu->workload_prority[type]);
 		index = fls(smu->workload_mask);
 		index = index <= WORKLOAD_POLICY_MAX ? index - 1 : 0;
 		workload[0] = smu->workload_setting[index];
 	}
 
-	smu->workload_mask = smu->driver_workload_mask |
-						 smu->user_dpm_profile.user_workload_mask;
-
 	if (smu_dpm_ctx->dpm_level != AMD_DPM_FORCED_LEVEL_MANUAL &&
 		smu_dpm_ctx->dpm_level != AMD_DPM_FORCED_LEVEL_PERF_DETERMINISM)
 		smu_bump_power_profile_mode(smu, workload, 0);
@@ -3059,23 +3049,12 @@ static int smu_set_power_profile_mode(void *handle,
 				      uint32_t param_size)
 {
 	struct smu_context *smu = handle;
-	int ret;
 
 	if (!smu->pm_enabled || !smu->adev->pm.dpm_enabled ||
 	    !smu->ppt_funcs->set_power_profile_mode)
 		return -EOPNOTSUPP;
 
-	if (smu->user_dpm_profile.user_workload_mask &
-	   (1 << smu->workload_priority[param[param_size]]))
-	   return 0;
-
-	smu->user_dpm_profile.user_workload_mask =
-		(1 << smu->workload_priority[param[param_size]]);
-	smu->workload_mask = smu->user_dpm_profile.user_workload_mask |
-		smu->driver_workload_mask;
-	ret = smu_bump_power_profile_mode(smu, param, param_size);
-
-	return ret;
+	return smu_bump_power_profile_mode(smu, param, param_size);
 }
 
 static int smu_get_fan_control_mode(void *handle, u32 *fan_mode)
diff --git a/drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h b/drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h
index d60d9a12a47e..b44a185d07e8 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h
+++ b/drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h
@@ -240,7 +240,6 @@ struct smu_user_dpm_profile {
 	/* user clock state information */
 	uint32_t clk_mask[SMU_CLK_COUNT];
 	uint32_t clk_dependency;
-	uint32_t user_workload_mask;
 };
 
 #define SMU_TABLE_INIT(tables, table_id, s, a, d)	\
@@ -558,8 +557,7 @@ struct smu_context {
 	bool disable_uclk_switch;
 
 	uint32_t workload_mask;
-	uint32_t driver_workload_mask;
-	uint32_t workload_priority[WORKLOAD_POLICY_MAX];
+	uint32_t workload_prority[WORKLOAD_POLICY_MAX];
 	uint32_t workload_setting[WORKLOAD_POLICY_MAX];
 	uint32_t power_profile_mode;
 	uint32_t default_power_profile_mode;
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c
index 31fe512028f4..c0f6b59369b7 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c
@@ -1455,6 +1455,7 @@ static int arcturus_set_power_profile_mode(struct smu_context *smu,
 		return -EINVAL;
 	}
 
+
 	if ((profile_mode == PP_SMC_POWER_PROFILE_CUSTOM) &&
 	     (smu->smc_fw_version >= 0x360d00)) {
 		if (size != 10)
@@ -1522,14 +1523,14 @@ static int arcturus_set_power_profile_mode(struct smu_context *smu,
 
 	ret = smu_cmn_send_smc_msg_with_param(smu,
 					  SMU_MSG_SetWorkloadMask,
-					  smu->workload_mask,
+					  1 << workload_type,
 					  NULL);
 	if (ret) {
 		dev_err(smu->adev->dev, "Fail to set workload type %d\n", workload_type);
 		return ret;
 	}
 
-	smu_cmn_assign_power_profile(smu);
+	smu->power_profile_mode = profile_mode;
 
 	return 0;
 }
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
index bb4ae529ae20..076620fa3ef5 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
@@ -2081,13 +2081,10 @@ static int navi10_set_power_profile_mode(struct smu_context *smu, long *input, u
 						       smu->power_profile_mode);
 	if (workload_type < 0)
 		return -EINVAL;
-
 	ret = smu_cmn_send_smc_msg_with_param(smu, SMU_MSG_SetWorkloadMask,
-				    smu->workload_mask, NULL);
+				    1 << workload_type, NULL);
 	if (ret)
 		dev_err(smu->adev->dev, "[%s] Failed to set work load mask!", __func__);
-	else
-		smu_cmn_assign_power_profile(smu);
 
 	return ret;
 }
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c
index ca94c52663c0..0d3e1a121b67 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c
@@ -1786,13 +1786,10 @@ static int sienna_cichlid_set_power_profile_mode(struct smu_context *smu, long *
 						       smu->power_profile_mode);
 	if (workload_type < 0)
 		return -EINVAL;
-
 	ret = smu_cmn_send_smc_msg_with_param(smu, SMU_MSG_SetWorkloadMask,
-				    smu->workload_mask, NULL);
+				    1 << workload_type, NULL);
 	if (ret)
 		dev_err(smu->adev->dev, "[%s] Failed to set work load mask!", __func__);
-	else
-		smu_cmn_assign_power_profile(smu);
 
 	return ret;
 }
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c
index 952ee22cbc90..1fe020f1f4db 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c
@@ -1079,7 +1079,7 @@ static int vangogh_set_power_profile_mode(struct smu_context *smu, long *input,
 	}
 
 	ret = smu_cmn_send_smc_msg_with_param(smu, SMU_MSG_ActiveProcessNotify,
-				    smu->workload_mask,
+				    1 << workload_type,
 				    NULL);
 	if (ret) {
 		dev_err_once(smu->adev->dev, "Fail to set workload type %d\n",
@@ -1087,7 +1087,7 @@ static int vangogh_set_power_profile_mode(struct smu_context *smu, long *input,
 		return ret;
 	}
 
-	smu_cmn_assign_power_profile(smu);
+	smu->power_profile_mode = profile_mode;
 
 	return 0;
 }
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c
index 62316a6707ef..cc0504b063fa 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c
@@ -890,14 +890,14 @@ static int renoir_set_power_profile_mode(struct smu_context *smu, long *input, u
 	}
 
 	ret = smu_cmn_send_smc_msg_with_param(smu, SMU_MSG_ActiveProcessNotify,
-				    smu->workload_mask,
+				    1 << workload_type,
 				    NULL);
 	if (ret) {
 		dev_err_once(smu->adev->dev, "Fail to set workload type %d\n", workload_type);
 		return ret;
 	}
 
-	smu_cmn_assign_power_profile(smu);
+	smu->power_profile_mode = profile_mode;
 
 	return 0;
 }
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c
index 5dd7ceca64fe..d53e162dcd8d 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c
@@ -2485,7 +2485,7 @@ static int smu_v13_0_0_set_power_profile_mode(struct smu_context *smu,
 	DpmActivityMonitorCoeffInt_t *activity_monitor =
 		&(activity_monitor_external.DpmActivityMonitorCoeffInt);
 	int workload_type, ret = 0;
-	u32 workload_mask;
+	u32 workload_mask, selected_workload_mask;
 
 	smu->power_profile_mode = input[size];
 
@@ -2552,7 +2552,7 @@ static int smu_v13_0_0_set_power_profile_mode(struct smu_context *smu,
 	if (workload_type < 0)
 		return -EINVAL;
 
-	workload_mask = 1 << workload_type;
+	selected_workload_mask = workload_mask = 1 << workload_type;
 
 	/* Add optimizations for SMU13.0.0/10.  Reuse the power saving profile */
 	if ((amdgpu_ip_version(smu->adev, MP1_HWIP, 0) == IP_VERSION(13, 0, 0) &&
@@ -2567,22 +2567,12 @@ static int smu_v13_0_0_set_power_profile_mode(struct smu_context *smu,
 			workload_mask |= 1 << workload_type;
 	}
 
-	smu->workload_mask |= workload_mask;
 	ret = smu_cmn_send_smc_msg_with_param(smu,
 					       SMU_MSG_SetWorkloadMask,
-					       smu->workload_mask,
+					       workload_mask,
 					       NULL);
-	if (!ret) {
-		smu_cmn_assign_power_profile(smu);
-		if (smu->power_profile_mode == PP_SMC_POWER_PROFILE_POWERSAVING) {
-			workload_type = smu_cmn_to_asic_specific_index(smu,
-							       CMN2ASIC_MAPPING_WORKLOAD,
-							       PP_SMC_POWER_PROFILE_FULLSCREEN3D);
-			smu->power_profile_mode = smu->workload_mask & (1 << workload_type)
-										? PP_SMC_POWER_PROFILE_FULLSCREEN3D
-										: PP_SMC_POWER_PROFILE_BOOTUP_DEFAULT;
-		}
-	}
+	if (!ret)
+		smu->workload_mask = selected_workload_mask;
 
 	return ret;
 }
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c
index 9d0b19419de0..b891a5e0a396 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c
@@ -2499,14 +2499,13 @@ static int smu_v13_0_7_set_power_profile_mode(struct smu_context *smu, long *inp
 						       smu->power_profile_mode);
 	if (workload_type < 0)
 		return -EINVAL;
-
 	ret = smu_cmn_send_smc_msg_with_param(smu, SMU_MSG_SetWorkloadMask,
-				    smu->workload_mask, NULL);
+				    1 << workload_type, NULL);
 
 	if (ret)
 		dev_err(smu->adev->dev, "[%s] Failed to set work load mask!", __func__);
 	else
-		smu_cmn_assign_power_profile(smu);
+		smu->workload_mask = (1 << workload_type);
 
 	return ret;
 }
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c
index d9f0e7f81ed7..eaf80c5b3e4d 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c
@@ -1508,11 +1508,12 @@ static int smu_v14_0_2_set_power_profile_mode(struct smu_context *smu,
 	if (workload_type < 0)
 		return -EINVAL;
 
-	ret = smu_cmn_send_smc_msg_with_param(smu, SMU_MSG_SetWorkloadMask,
-										  smu->workload_mask, NULL);
-
+	ret = smu_cmn_send_smc_msg_with_param(smu,
+					       SMU_MSG_SetWorkloadMask,
+					       1 << workload_type,
+					       NULL);
 	if (!ret)
-		smu_cmn_assign_power_profile(smu);
+		smu->workload_mask = 1 << workload_type;
 
 	return ret;
 }
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c b/drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c
index bdfc5e617333..91ad434bcdae 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c
@@ -1138,14 +1138,6 @@ int smu_cmn_set_mp1_state(struct smu_context *smu,
 	return ret;
 }
 
-void smu_cmn_assign_power_profile(struct smu_context *smu)
-{
-	uint32_t index;
-	index = fls(smu->workload_mask);
-	index = index > 0 && index <= WORKLOAD_POLICY_MAX ? index - 1 : 0;
-	smu->power_profile_mode = smu->workload_setting[index];
-}
-
 bool smu_cmn_is_audio_func_enabled(struct amdgpu_device *adev)
 {
 	struct pci_dev *p = NULL;
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h b/drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h
index 8a801e389659..1de685defe85 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h
@@ -130,8 +130,6 @@ void smu_cmn_init_soft_gpu_metrics(void *table, uint8_t frev, uint8_t crev);
 int smu_cmn_set_mp1_state(struct smu_context *smu,
 			  enum pp_mp1_state mp1_state);
 
-void smu_cmn_assign_power_profile(struct smu_context *smu);
-
 /*
  * Helper function to make sysfs_emit_at() happy. Align buf to
  * the current page boundary and record the offset.
-- 
2.47.0

Re: [PATCH] Revert "drm/amd/pm: correct the workload setting"

[Greg KH]

On Sat, Nov 16, 2024 at 08:04:27AM -0500, Alex Deucher wrote:
> This reverts commit 4a18810d0b6fb2b853b75d21117040a783f2ab66.
> 
> This causes a regression in the workload selection.
> A more extensive fix is being worked on for mainline.
> For stable, revert.

Why is this not reverted in Linus's tree too?  Why is this only for a
stable tree?  Why can't we take what will be in 6.12?

thanks,

greg k-h

Re: [PATCH] Revert "drm/amd/pm: correct the workload setting"

[Alex Deucher]

On Sat, Nov 16, 2024 at 8:47 AM Greg KH <gregkh@linuxfoundation.org> wrote:
>
> On Sat, Nov 16, 2024 at 08:04:27AM -0500, Alex Deucher wrote:
> > This reverts commit 4a18810d0b6fb2b853b75d21117040a783f2ab66.
> >
> > This causes a regression in the workload selection.
> > A more extensive fix is being worked on for mainline.
> > For stable, revert.
>
> Why is this not reverted in Linus's tree too?  Why is this only for a
> stable tree?  Why can't we take what will be in 6.12?

I'm about to send out the patch for 6.12 as well, but I want to make
sure it gets into 6.11 before it's EOL.

Alex

>
> thanks,
>
> greg k-h

Re: [PATCH] Revert "drm/amd/pm: correct the workload setting"

[Greg KH]

On Sat, Nov 16, 2024 at 08:48:58AM -0500, Alex Deucher wrote:
> On Sat, Nov 16, 2024 at 8:47 AM Greg KH <gregkh@linuxfoundation.org> wrote:
> >
> > On Sat, Nov 16, 2024 at 08:04:27AM -0500, Alex Deucher wrote:
> > > This reverts commit 4a18810d0b6fb2b853b75d21117040a783f2ab66.
> > >
> > > This causes a regression in the workload selection.
> > > A more extensive fix is being worked on for mainline.
> > > For stable, revert.
> >
> > Why is this not reverted in Linus's tree too?  Why is this only for a
> > stable tree?  Why can't we take what will be in 6.12?
> 
> I'm about to send out the patch for 6.12 as well, but I want to make
> sure it gets into 6.11 before it's EOL.

If 6.11 is EOL, there's no need to worry about it :)

I'd much prefer to take the real patch please.

thanks,

greg k-h

Re: [PATCH] Revert "drm/amd/pm: correct the workload setting"

[Alex Deucher]

On Sat, Nov 16, 2024 at 9:51 AM Greg KH <gregkh@linuxfoundation.org> wrote:
>
> On Sat, Nov 16, 2024 at 08:48:58AM -0500, Alex Deucher wrote:
> > On Sat, Nov 16, 2024 at 8:47 AM Greg KH <gregkh@linuxfoundation.org> wrote:
> > >
> > > On Sat, Nov 16, 2024 at 08:04:27AM -0500, Alex Deucher wrote:
> > > > This reverts commit 4a18810d0b6fb2b853b75d21117040a783f2ab66.
> > > >
> > > > This causes a regression in the workload selection.
> > > > A more extensive fix is being worked on for mainline.
> > > > For stable, revert.
> > >
> > > Why is this not reverted in Linus's tree too?  Why is this only for a
> > > stable tree?  Why can't we take what will be in 6.12?
> >
> > I'm about to send out the patch for 6.12 as well, but I want to make
> > sure it gets into 6.11 before it's EOL.
>
> If 6.11 is EOL, there's no need to worry about it :)

End users care :)

>
> I'd much prefer to take the real patch please.

Here's the PR I sent to Dave and Sima:
https://lists.freedesktop.org/archives/dri-devel/2024-November/477927.html
I didn't cc stable because I had already send this patch to stable in
this thread.

Alex

>
> thanks,
>
> greg k-h

Re: [PATCH] Revert "drm/amd/pm: correct the workload setting"

[Greg KH]

On Sat, Nov 16, 2024 at 10:07:38AM -0500, Alex Deucher wrote:
> On Sat, Nov 16, 2024 at 9:51 AM Greg KH <gregkh@linuxfoundation.org> wrote:
> >
> > On Sat, Nov 16, 2024 at 08:48:58AM -0500, Alex Deucher wrote:
> > > On Sat, Nov 16, 2024 at 8:47 AM Greg KH <gregkh@linuxfoundation.org> wrote:
> > > >
> > > > On Sat, Nov 16, 2024 at 08:04:27AM -0500, Alex Deucher wrote:
> > > > > This reverts commit 4a18810d0b6fb2b853b75d21117040a783f2ab66.
> > > > >
> > > > > This causes a regression in the workload selection.
> > > > > A more extensive fix is being worked on for mainline.
> > > > > For stable, revert.
> > > >
> > > > Why is this not reverted in Linus's tree too?  Why is this only for a
> > > > stable tree?  Why can't we take what will be in 6.12?
> > >
> > > I'm about to send out the patch for 6.12 as well, but I want to make
> > > sure it gets into 6.11 before it's EOL.
> >
> > If 6.11 is EOL, there's no need to worry about it :)
> 
> End users care :)
> 
> >
> > I'd much prefer to take the real patch please.
> 
> Here's the PR I sent to Dave and Sima:
> https://lists.freedesktop.org/archives/dri-devel/2024-November/477927.html
> I didn't cc stable because I had already send this patch to stable in
> this thread.

I'd much rather prefer to match up with what is in Linus's tree.  If you
have the git id that lands in Linus's tree, please let us know and we
can take that.  This way we can keep 6.11 and 6.12 in sync, right?

thanks,

greg k-h

Re: [PATCH] Revert "drm/amd/pm: correct the workload setting"

[Alex Deucher]

On Sat, Nov 16, 2024 at 11:07 AM Greg KH <gregkh@linuxfoundation.org> wrote:
>
> On Sat, Nov 16, 2024 at 10:07:38AM -0500, Alex Deucher wrote:
> > On Sat, Nov 16, 2024 at 9:51 AM Greg KH <gregkh@linuxfoundation.org> wrote:
> > >
> > > On Sat, Nov 16, 2024 at 08:48:58AM -0500, Alex Deucher wrote:
> > > > On Sat, Nov 16, 2024 at 8:47 AM Greg KH <gregkh@linuxfoundation.org> wrote:
> > > > >
> > > > > On Sat, Nov 16, 2024 at 08:04:27AM -0500, Alex Deucher wrote:
> > > > > > This reverts commit 4a18810d0b6fb2b853b75d21117040a783f2ab66.
> > > > > >
> > > > > > This causes a regression in the workload selection.
> > > > > > A more extensive fix is being worked on for mainline.
> > > > > > For stable, revert.
> > > > >
> > > > > Why is this not reverted in Linus's tree too?  Why is this only for a
> > > > > stable tree?  Why can't we take what will be in 6.12?
> > > >
> > > > I'm about to send out the patch for 6.12 as well, but I want to make
> > > > sure it gets into 6.11 before it's EOL.
> > >
> > > If 6.11 is EOL, there's no need to worry about it :)
> >
> > End users care :)
> >
> > >
> > > I'd much prefer to take the real patch please.
> >
> > Here's the PR I sent to Dave and Sima:
> > https://lists.freedesktop.org/archives/dri-devel/2024-November/477927.html
> > I didn't cc stable because I had already send this patch to stable in
> > this thread.
>
> I'd much rather prefer to match up with what is in Linus's tree.  If you
> have the git id that lands in Linus's tree, please let us know and we
> can take that.  This way we can keep 6.11 and 6.12 in sync, right?

Sure, but if the patch happened to miss 6.12.0, it would have landed
in 6.12.1.  If that happened 6.11 may have missed it and right now and
for the near future, 6.11 is what is important to users and distros.
Anyway, the patch landed before 6.12 final, so please pull:
commit 44f392fbf628 ("Revert "drm/amd/pm: correct the workload setting"")
into 6.11 stable.

Thanks!

Alex

>
> thanks,
>
> greg k-h

Re: [PATCH] Revert "drm/amd/pm: correct the workload setting"

[Greg KH]

On Mon, Nov 18, 2024 at 09:09:53AM -0500, Alex Deucher wrote:
> On Sat, Nov 16, 2024 at 11:07 AM Greg KH <gregkh@linuxfoundation.org> wrote:
> >
> > On Sat, Nov 16, 2024 at 10:07:38AM -0500, Alex Deucher wrote:
> > > On Sat, Nov 16, 2024 at 9:51 AM Greg KH <gregkh@linuxfoundation.org> wrote:
> > > >
> > > > On Sat, Nov 16, 2024 at 08:48:58AM -0500, Alex Deucher wrote:
> > > > > On Sat, Nov 16, 2024 at 8:47 AM Greg KH <gregkh@linuxfoundation.org> wrote:
> > > > > >
> > > > > > On Sat, Nov 16, 2024 at 08:04:27AM -0500, Alex Deucher wrote:
> > > > > > > This reverts commit 4a18810d0b6fb2b853b75d21117040a783f2ab66.
> > > > > > >
> > > > > > > This causes a regression in the workload selection.
> > > > > > > A more extensive fix is being worked on for mainline.
> > > > > > > For stable, revert.
> > > > > >
> > > > > > Why is this not reverted in Linus's tree too?  Why is this only for a
> > > > > > stable tree?  Why can't we take what will be in 6.12?
> > > > >
> > > > > I'm about to send out the patch for 6.12 as well, but I want to make
> > > > > sure it gets into 6.11 before it's EOL.
> > > >
> > > > If 6.11 is EOL, there's no need to worry about it :)
> > >
> > > End users care :)
> > >
> > > >
> > > > I'd much prefer to take the real patch please.
> > >
> > > Here's the PR I sent to Dave and Sima:
> > > https://lists.freedesktop.org/archives/dri-devel/2024-November/477927.html
> > > I didn't cc stable because I had already send this patch to stable in
> > > this thread.
> >
> > I'd much rather prefer to match up with what is in Linus's tree.  If you
> > have the git id that lands in Linus's tree, please let us know and we
> > can take that.  This way we can keep 6.11 and 6.12 in sync, right?
> 
> Sure, but if the patch happened to miss 6.12.0, it would have landed
> in 6.12.1.  If that happened 6.11 may have missed it and right now and
> for the near future, 6.11 is what is important to users and distros.
> Anyway, the patch landed before 6.12 final, so please pull:
> commit 44f392fbf628 ("Revert "drm/amd/pm: correct the workload setting"")
> into 6.11 stable.

It's already been queued up, happened yesterday :)

thanks,

greg k-h