Thank you for your contribution! Sashiko AI review found 4 potential issues to consider: - [High] drm/xe: missing Signed-off-by trailer and unresolved template placeholders - [High] drm/xe: undeclared fields and enum in xe_info_init_early() and descriptors - [High] drm/xe: conflicting prototype for xe_pm_suspend() against xe_pm.h - [High] drm/xe: calls to undeclared PM helpers in xe_pm_suspend() and resume paths --
commit 9589bfc1c2e1387822d0222f3ab550943b103833 Author: Mark Brown <[email protected]> > linux-next: manual merge of the drm tree with the drm-fixes tree > > Hi all, > > Today's linux-next merge of the drm tree got conflicts in: > > drivers/gpu/drm/xe/xe_pci.c > drivers/gpu/drm/xe/xe_pm.c > > between commit: > > ??? > > from the drm-fixes tree and commit: > > ??? > > from the drm 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. [Severity: High] The commit message is missing a Signed-off-by: trailer, leaves literal "???" placeholders for the conflicting commits, and applies standalone merge-resolution hunks without the underlying drm tree commits. > diff --git a/drivers/gpu/drm/xe/xe_pci.c b/drivers/gpu/drm/xe/xe_pci.c > index 12ff5c9025478..3bd68ed9daa81 100644 > --- a/drivers/gpu/drm/xe/xe_pci.c > +++ b/drivers/gpu/drm/xe/xe_pci.c > @@ -417,16 +417,17 @@ static const struct xe_device_desc bmg_desc = { > .dma_mask_size = 46, > .has_display = true, > .has_fan_control = true, > + .has_fixed_vram_channels = true, > .has_flat_ccs = 1, > .has_mbx_power_limits = true, > .has_mbx_thermal_info = true, > .has_gsc_nvm = 1, > .has_heci_cscfi = 1, > .has_i2c = true, > - .has_late_bind = true, > .has_pre_prod_wa = 1, > .has_soc_remapper_telem = true, > .has_sriov = true, > + .late_bind_mask = BIT(XE_LB_FW_FAN_CONTROL), > .max_gt_per_tile = 2, > MULTI_LRC_MASK, > .needs_scratch = true, > @@ -487,6 +488,8 @@ static const struct xe_device_desc cri_desc = { > .has_sriov = true, > .has_sysctrl = true, > .has_temp_sentinel = true, > + .late_bind_mask = BIT(XE_LB_FW_FAN_CONTROL) | > + BIT(XE_LB_FW_OCODE), > .max_gt_per_tile = 2, > MULTI_LRC_MASK, > .require_force_probe = true, [ ... ] > @@ -798,6 +803,7 @@ static int xe_info_init_early(struct xe_device *xe, > xe->info.has_device_uid = desc->has_device_uid; > xe->info.has_drm_ras = desc->has_drm_ras; > xe->info.has_fan_control = desc->has_fan_control; > + xe->info.has_fixed_vram_channels = desc->has_fixed_vram_channels; > /* runtime fusing may force flat_ccs to disabled later */ > xe->info.has_flat_ccs = desc->has_flat_ccs; > xe->info.has_mbx_power_limits = desc->has_mbx_power_limits; > @@ -806,7 +812,6 @@ static int xe_info_init_early(struct xe_device *xe, > xe->info.has_heci_gscfi = desc->has_heci_gscfi; > xe->info.has_heci_cscfi = desc->has_heci_cscfi; > xe->info.has_i2c = desc->has_i2c; > - xe->info.has_late_bind = desc->has_late_bind; > xe->info.has_llc = desc->has_llc; > xe->info.has_mert = desc->has_mert; > xe->info.has_page_reclaim_hw_assist = desc->has_page_reclaim_hw_assist; > @@ -819,11 +824,13 @@ static int xe_info_init_early(struct xe_device *xe, > desc->has_sriov; > xe->info.has_sysctrl = desc->has_sysctrl; > xe->info.has_temp_sentinel = desc->has_temp_sentinel; > + xe->info.require_force_probe = desc->require_force_probe; > xe->info.skip_guc_pc = desc->skip_guc_pc; > xe->info.skip_pcode = desc->skip_pcode; > xe->info.needs_scratch = desc->needs_scratch; > xe->info.needs_shared_vf_gt_wq = desc->needs_shared_vf_gt_wq; > xe->info.multi_lrc_mask = desc->multi_lrc_mask; > + xe->info.late_bind_mask = desc->late_bind_mask; [Severity: High] Does this break the build by referencing undeclared struct members and enum constants? Neither struct xe_device_desc nor struct intel_device_info defines has_fixed_vram_channels or late_bind_mask, struct intel_device_info has no require_force_probe member, and enum xe_late_bind_fw_id does not define XE_LB_FW_OCODE. Removing the initialization of has_late_bind also leaves xe->info.has_late_bind zero, causing xe_late_bind_init() to skip late-bind firmware initialization. [ ... ] > diff --git a/drivers/gpu/drm/xe/xe_pm.c b/drivers/gpu/drm/xe/xe_pm.c > index d95f0d128ed49..e73192b03074a 100644 > --- a/drivers/gpu/drm/xe/xe_pm.c > +++ b/drivers/gpu/drm/xe/xe_pm.c > @@ -166,13 +166,19 @@ static void xe_rpm_lockmap_release(const struct > xe_device *xe) > &xe_pm_runtime_d3cold_map); > } > > +static bool xe_pm_needs_bo_evict(struct xe_device *xe, bool hibernate) > +{ > + return IS_DGFX(xe) || hibernate; > +} > + > /** > - * xe_pm_suspend - Helper for System suspend, i.e. S0->S3 / S0->S2idle > + * xe_pm_suspend - Helper for System suspend, i.e. S0->S3 / S0->S2idle / > S0->S4 > * @xe: xe device instance > + * @hibernate: true if preparing for S4 hibernation, false for < S4 suspend > * > * Return: 0 on success > */ > -int xe_pm_suspend(struct xe_device *xe) > +int xe_pm_suspend(struct xe_device *xe, bool hibernate) [Severity: High] Does adding the hibernate parameter to xe_pm_suspend() without updating drivers/gpu/drm/xe/xe_pm.h break compilation? xe_pm.h still declares int xe_pm_suspend(struct xe_device *xe), causing a too-many-arguments error in __xe_pci_suspend() and a conflicting-types error in xe_pm.c. > @@ -186,17 +192,19 @@ int xe_pm_suspend(struct xe_device *xe) > if (err) > goto err; > > - xe_late_bind_wait_for_worker_completion(&xe->late_bind); > + xe_late_bind_pm_suspend(&xe->late_bind); [ ... ] > @@ -249,7 +257,7 @@ int xe_pm_resume(struct xe_device *xe) > xe_wa_apply_tile_workarounds(tile); > > for_each_gt(gt, xe, id) > - xe_gt_idle_disable_c6(gt); > + xe_gt_resume_early(gt); > > xe_display_pm_resume_early(xe); > > @@ -290,7 +298,7 @@ int xe_pm_resume(struct xe_device *xe) > if (IS_VF_CCS_READY(xe)) > xe_sriov_vf_ccs_register_context(xe); > > - xe_late_bind_fw_load(&xe->late_bind); > + xe_late_bind_pm_resume(&xe->late_bind); [ ... ] > @@ -707,7 +721,7 @@ int xe_pm_runtime_resume(struct xe_device *xe) > xe_wa_apply_tile_workarounds(tile); > > for_each_gt(gt, xe, id) > - xe_gt_idle_disable_c6(gt); > + xe_gt_resume_early(gt); > > xe_display_pm_resume_early(xe); > > @@ -755,7 +769,7 @@ int xe_pm_runtime_resume(struct xe_device *xe) > xe_sriov_vf_ccs_register_context(xe); > > if (xe->d3cold.allowed) > - xe_late_bind_fw_load(&xe->late_bind); > + xe_late_bind_pm_resume(&xe->late_bind); [Severity: High] Are xe_late_bind_pm_suspend(), xe_late_bind_pm_resume(), and xe_gt_resume_early() missing from the tree? None of these helpers are declared in xe_late_bind_fw.h or xe_gt.h or defined anywhere in the tree, so compiling xe_pm.c fails with implicit function declaration errors. -- Sashiko AI review ยท https://sashiko.dev/#/patchset/[email protected]?part=1
