linux-next: manual merge of the amdgpu tree with the origin tree

linux-next: manual merge of the amdgpu tree with the origin tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 3017 bytes --]

Hi all,

Today's linux-next merge of the amdgpu tree got a conflict in:

  drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c

between commits:

  a2eae9f4fa1b0 ("drm/amd/pm: add zero fan stop temperature support on smu 14.0.2")
  44d0d3031e479 ("drm/amd/pm:restate all customized OD features on every table upload for smu 13.0.0/smu 14.0.2")
  af52c8fd45fbd ("drm/amd/pm: add zero fan stop temperature support on smu 14.0.2")
  9b0890e72d19b ("drm/amd/pm: preserve committed OD features for SMU 14.0.2")

from the origin tree and commits:

  f990c94a2633d ("drm/amd/pm: add zero fan stop temperature support on smu 14.0.2")
  1b63bb397db20 ("drm/amd/pm:restate all customized OD features on every table upload for smu 13.0.0/smu 14.0.2")
  d2c1e98658b6c ("drm/amd/pm: report smu energy accumulator updates")
  8d4ce79aff1cd ("drm/amd/pm: preserve committed OD features for SMU 14.0.2")

from the amdgpu tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --combined drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c
index dda435f19ca66,62f16d17e22bc..0000000000000
--- 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
@@@ -2277,8 -2277,11 +2277,11 @@@ static ssize_t smu_v14_0_2_get_gpu_metr
  					       metrics->Vcn1ActivityPercentage);
  
  	gpu_metrics->average_socket_power = metrics->AverageSocketPower;
- 	if (mp1_ver == IP_VERSION(14, 0, 3) && smu->smc_fw_version >= 0x00685000)
- 	    gpu_metrics->energy_accumulator = metrics->EnergyAccumulator;
+ 	if ((mp1_ver == IP_VERSION(14, 0, 2) &&
+ 	     smu->smc_fw_version >= 0x00664800) ||
+ 	    (mp1_ver == IP_VERSION(14, 0, 3) &&
+ 	     smu->smc_fw_version >= 0x00685000))
+ 		gpu_metrics->energy_accumulator = metrics->EnergyAccumulator;
  
  	if (metrics->AverageGfxActivity <= SMU_14_0_2_BUSY_THRESHOLD)
  		gpu_metrics->average_gfxclk_frequency = metrics->AverageGfxclkFrequencyPostDs;
@@@ -2600,14 -2603,9 +2603,10 @@@ static int smu_v14_0_2_od_restore_table
  		od_table->OverDriveTable.FanZeroRpmEnable =
  					boot_overdrive_table->OverDriveTable.FanZeroRpmEnable;
  		break;
- 	case PP_OD_EDIT_FAN_ZERO_RPM_STOP_TEMP:
- 		od_table->OverDriveTable.FanZeroRpmStopTemp =
- 					boot_overdrive_table->OverDriveTable.FanZeroRpmStopTemp;
- 		break;
  	case PP_OD_EDIT_FAN_ZERO_RPM_STOP_TEMP:
  		od_table->OverDriveTable.FanZeroRpmStopTemp =
  					boot_overdrive_table->OverDriveTable.FanZeroRpmStopTemp;
 +		od_table->OverDriveTable.FeatureCtrlMask |= BIT(PP_OD_FEATURE_ZERO_FAN_BIT);
  		break;
  	case PP_OD_EDIT_ACOUSTIC_LIMIT:
  		od_table->OverDriveTable.AcousticLimitRpmThreshold =

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the amdgpu tree with the origin tree

[Alex Deucher]

On Thu, Oct 29, 2026 at 10:18 AM Mark Brown <broonie@kernel.org> wrote:
>
> Hi all,
>
> Today's linux-next merge of the amdgpu tree got a conflict in:
>
>   drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c
>
> between commits:
>
>   a2eae9f4fa1b0 ("drm/amd/pm: add zero fan stop temperature support on smu 14.0.2")
>   44d0d3031e479 ("drm/amd/pm:restate all customized OD features on every table upload for smu 13.0.0/smu 14.0.2")
>   af52c8fd45fbd ("drm/amd/pm: add zero fan stop temperature support on smu 14.0.2")
>   9b0890e72d19b ("drm/amd/pm: preserve committed OD features for SMU 14.0.2")
>
> from the origin tree and commits:
>
>   f990c94a2633d ("drm/amd/pm: add zero fan stop temperature support on smu 14.0.2")
>   1b63bb397db20 ("drm/amd/pm:restate all customized OD features on every table upload for smu 13.0.0/smu 14.0.2")
>   d2c1e98658b6c ("drm/amd/pm: report smu energy accumulator updates")
>   8d4ce79aff1cd ("drm/amd/pm: preserve committed OD features for SMU 14.0.2")
>
> from the amdgpu tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> diff --combined drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c
> index dda435f19ca66,62f16d17e22bc..0000000000000
> --- 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
> @@@ -2277,8 -2277,11 +2277,11 @@@ static ssize_t smu_v14_0_2_get_gpu_metr
>                                                metrics->Vcn1ActivityPercentage);
>
>         gpu_metrics->average_socket_power = metrics->AverageSocketPower;
> -       if (mp1_ver == IP_VERSION(14, 0, 3) && smu->smc_fw_version >= 0x00685000)
> -           gpu_metrics->energy_accumulator = metrics->EnergyAccumulator;
> +       if ((mp1_ver == IP_VERSION(14, 0, 2) &&
> +            smu->smc_fw_version >= 0x00664800) ||
> +           (mp1_ver == IP_VERSION(14, 0, 3) &&
> +            smu->smc_fw_version >= 0x00685000))
> +               gpu_metrics->energy_accumulator = metrics->EnergyAccumulator;
>
>         if (metrics->AverageGfxActivity <= SMU_14_0_2_BUSY_THRESHOLD)
>                 gpu_metrics->average_gfxclk_frequency = metrics->AverageGfxclkFrequencyPostDs;
> @@@ -2600,14 -2603,9 +2603,10 @@@ static int smu_v14_0_2_od_restore_table
>                 od_table->OverDriveTable.FanZeroRpmEnable =
>                                         boot_overdrive_table->OverDriveTable.FanZeroRpmEnable;
>                 break;
> -       case PP_OD_EDIT_FAN_ZERO_RPM_STOP_TEMP:
> -               od_table->OverDriveTable.FanZeroRpmStopTemp =
> -                                       boot_overdrive_table->OverDriveTable.FanZeroRpmStopTemp;
> -               break;
>         case PP_OD_EDIT_FAN_ZERO_RPM_STOP_TEMP:
>                 od_table->OverDriveTable.FanZeroRpmStopTemp =
>                                         boot_overdrive_table->OverDriveTable.FanZeroRpmStopTemp;
>  +              od_table->OverDriveTable.FeatureCtrlMask |= BIT(PP_OD_FEATURE_ZERO_FAN_BIT);

I believe this should be dropped.  The FeatureCtrlMask updates are
handled in smu_v14_0_2_od_edit_dpm_table() now.

Thanks,

Alex

>                 break;
>         case PP_OD_EDIT_ACOUSTIC_LIMIT:
>                 od_table->OverDriveTable.AcousticLimitRpmThreshold =

Re: linux-next: manual merge of the amdgpu tree with the origin tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 747 bytes --]

On Thu, Oct 29, 2026 at 10:24:43AM -0400, Alex Deucher wrote:
> On Thu, Oct 29, 2026 at 10:18 AM Mark Brown <broonie@kernel.org> wrote:

> >         case PP_OD_EDIT_FAN_ZERO_RPM_STOP_TEMP:
> >                 od_table->OverDriveTable.FanZeroRpmStopTemp =
> >                                         boot_overdrive_table->OverDriveTable.FanZeroRpmStopTemp;
> >  +              od_table->OverDriveTable.FeatureCtrlMask |= BIT(PP_OD_FEATURE_ZERO_FAN_BIT);
> 
> I believe this should be dropped.  The FeatureCtrlMask updates are
> handled in smu_v14_0_2_od_edit_dpm_table() now.

I guess it'll get dropped from your tree in that case?  With all this
cherry picking noise I tend to assume that the amdgpu tree has the
indended state...

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[PATCH linux-next] drm/amd/pm: fix up the amdgpu merge of the smu 14.0.2 zero fan restore

[Sasha Levin]

After the drm merge, smu_v14_0_2_od_restore_table_single() has two
PP_OD_EDIT_FAN_ZERO_RPM_STOP_TEMP cases: the drm-next one and the one
from commit a2eae9f4fa1b ("drm/amd/pm: add zero fan stop temperature
support on smu 14.0.2") in mainline. The amdgpu merge resolution drops
the drm-next one and keeps the mainline one, which still sets
PP_OD_FEATURE_ZERO_FAN_BIT in FeatureCtrlMask.

Commit 8d4ce79aff1c ("drm/amd/pm: preserve committed OD features for
SMU 14.0.2") and its drm-next cherry-pick removed that update from both
zero fan restore cases. Remove it again so the file matches the amdgpu
tree.

Fixes: 0575e86c31a9 ("Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux.git")
Link: https://lore.kernel.org/all/auNVlhF6DGyFYx10@sirena.org.uk/
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
Mark, this applies on top of next-20261029 and is meant to be folded into
the amdgpu merge resolution.

 drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c | 1 -
 1 file changed, 1 deletion(-)

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 24a3d61d8ea66..62f16d17e22bc 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
@@ -2606,7 +2606,6 @@ static int smu_v14_0_2_od_restore_table_single(struct smu_context *smu, long inp
 	case PP_OD_EDIT_FAN_ZERO_RPM_STOP_TEMP:
 		od_table->OverDriveTable.FanZeroRpmStopTemp =
 					boot_overdrive_table->OverDriveTable.FanZeroRpmStopTemp;
-		od_table->OverDriveTable.FeatureCtrlMask |= BIT(PP_OD_FEATURE_ZERO_FAN_BIT);
 		break;
 	case PP_OD_EDIT_ACOUSTIC_LIMIT:
 		od_table->OverDriveTable.AcousticLimitRpmThreshold =

base-commit: a39c950806213f6861d00f90729acaaa21f2d95a
-- 
2.53.0