Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/xe/display/xe_display.c between commit: 4bfc9c553f5e ("drm/xe/display: Avoid encoder_suspend at runtime suspend") from Linus' tree and commit: 769b081c18b9 ("drm/i915/opregion: convert to struct intel_display") 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. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/xe/display/xe_display.c index c860fda410c8,710b1e2170c1..000000000000 --- a/drivers/gpu/drm/xe/display/xe_display.c +++ b/drivers/gpu/drm/xe/display/xe_display.c @@@ -331,12 -345,12 +345,12 @@@ void xe_display_pm_suspend(struct xe_de intel_hpd_cancel_work(xe); - if (!runtime && has_display(xe)) + if (!runtime && has_display(xe)) { intel_display_driver_suspend_access(xe); - - intel_encoder_suspend_all(&xe->display); + intel_encoder_suspend_all(&xe->display); + } - intel_opregion_suspend(xe, s2idle ? PCI_D1 : PCI_D3cold); + intel_opregion_suspend(display, s2idle ? PCI_D1 : PCI_D3cold); intel_dmc_suspend(xe); }
Attachment:
pgpTtfa5mctxf.pgp
Description: OpenPGP digital signature