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

[Mark Brown]

On Wed, Oct 28, 2026 at 01:28:42PM +0000, Mark Brown 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 commit:
> 
>   a2eae9f4fa1b0 ("drm/amd/pm: add zero fan stop temperature support on 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.

Also needs this additional fixup to cope with the cherry picking:

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 cdd308ced4f9a..24a3d61d8ea66 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
@@ -2603,10 +2603,6 @@ static int smu_v14_0_2_od_restore_table_single(struct smu_context *smu, long inp
 		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;

Attachment: signature.asc
Description: PGP signature