linux-next: manual merge of the drm-intel tree with Linus' tree

[Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>]

Hi all,

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

  drivers/gpu/drm/xe/display/xe_display.c

between commit:

  a4de6beb83fc ("drm/xe/display: Separate the d3cold and non-d3cold runtime PM handling")

from Linus' tree and commit:

  f5d38d4fa884 ("drm/i915/display: convert intel_display_driver.[ch] to struct intel_display")

from the drm-intel 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 b5502f335f53,b8bfb666ebe8..000000000000
--- a/drivers/gpu/drm/xe/display/xe_display.c
+++ b/drivers/gpu/drm/xe/display/xe_display.c
@@@ -446,25 -470,20 +475,22 @@@ static void __xe_display_pm_resume(stru
  	if (has_display(xe))
  		drm_mode_config_reset(&xe->drm);
  
- 	intel_display_driver_init_hw(xe);
- 	intel_hpd_init(xe);
+ 	intel_display_driver_init_hw(display);
  
  	if (!runtime && has_display(xe))
- 		intel_display_driver_resume_access(xe);
+ 		intel_display_driver_resume_access(display);
  
- 	/* MST sideband requires HPD interrupts enabled */
- 	if (!runtime)
- 		intel_dp_mst_resume(xe);
+ 	intel_hpd_init(xe);
  
  	if (!runtime && has_display(xe)) {
- 		intel_display_driver_resume(xe);
+ 		intel_display_driver_resume(display);
  		drm_kms_helper_poll_enable(&xe->drm);
- 		intel_display_driver_enable_user_access(xe);
+ 		intel_display_driver_enable_user_access(display);
 -		intel_hpd_poll_disable(xe);
  	}
  
 +	if (has_display(xe))
 +		intel_hpd_poll_disable(xe);
 +
  	intel_opregion_resume(display);
  
  	if (!runtime)

Attachment: pgpyanUBJrJDW.pgp
Description: OpenPGP digital signature