lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  linux-cve-announce  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20241014142439.40e63852@canb.auug.org.au>
Date: Mon, 14 Oct 2024 14:24:39 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Lucas De Marchi <lucas.demarchi@...el.com>, Thomas Hellström <thomas.hellstrom@...ux.intel.com>, Simona Vetter
 <simona.vetter@...ll.ch>, Jani Nikula <jani.nikula@...ux.intel.com>, Joonas
 Lahtinen <joonas.lahtinen@...ux.intel.com>, Rodrigo Vivi
 <rodrigo.vivi@...el.com>
Cc: Imre Deak <imre.deak@...el.com>, Intel Graphics
 <intel-gfx@...ts.freedesktop.org>, DRI <dri-devel@...ts.freedesktop.org>,
 DRM XE List <intel-xe@...ts.freedesktop.org>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Ville Syrjälä
 <ville.syrjala@...ux.intel.com>
Subject: linux-next: manual merge of the drm-xe tree with the drm-intel tree

Hi all,

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

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

between commit:

  5c30cfa295cc ("drm/i915/dmc: Convert DMC code to intel_display")

from the drm-intel tree and commit:

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

from the drm-xe 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 957ae763531d,5c6b74c36b60..000000000000
--- a/drivers/gpu/drm/xe/display/xe_display.c
+++ b/drivers/gpu/drm/xe/display/xe_display.c
@@@ -344,7 -340,10 +344,10 @@@ static void __xe_display_pm_suspend(str
  
  	intel_opregion_suspend(display, s2idle ? PCI_D1 : PCI_D3cold);
  
 -	intel_dmc_suspend(xe);
 +	intel_dmc_suspend(display);
+ 
+ 	if (runtime && has_display(xe))
+ 		intel_hpd_poll_enable(xe);
  }
  
  void xe_display_pm_suspend(struct xe_device *xe)
@@@ -453,13 -452,14 +458,15 @@@ static void __xe_display_pm_resume(stru
  		intel_display_driver_resume(xe);
  		drm_kms_helper_poll_enable(&xe->drm);
  		intel_display_driver_enable_user_access(xe);
- 		intel_hpd_poll_disable(xe);
  	}
  
+ 	if (has_display(xe))
+ 		intel_hpd_poll_disable(xe);
+ 
  	intel_opregion_resume(display);
  
 -	intel_fbdev_set_suspend(&xe->drm, FBINFO_STATE_RUNNING, false);
 +	if (!runtime)
 +		intel_fbdev_set_suspend(&xe->drm, FBINFO_STATE_RUNNING, false);
  
  	intel_power_domains_enable(xe);
  }

Content of type "application/pgp-signature" skipped

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ