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

[Mark Brown]

Hi all,

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

  drivers/gpu/drm/xe/xe_pci.c

between commit:

  41dae8ac5a3e1 ("drm/xe/pm: introduce PM PME support")

from the drm-intel tree and commit:

  320662381ca24 ("drm/xe: Poll GT for C6 before D3")

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.

diff --cc drivers/gpu/drm/xe/xe_pci.c
index b134d90c01a1c,d66d5a0339ae3..0000000000000
--- a/drivers/gpu/drm/xe/xe_pci.c
+++ b/drivers/gpu/drm/xe/xe_pci.c
@@@ -1380,9 -1379,7 +1379,9 @@@ static int xe_pci_runtime_suspend(struc
  {
  	struct pci_dev *pdev = to_pci_dev(dev);
  	struct xe_device *xe = pdev_to_xe_device(pdev);
 +	unsigned int flags;
 +	bool pme_enabled;
- 	int err;
+ 	int err, ret;
  
  	/*
  	 * We hold an additional reference to the runtime PM to keep PF in D0
@@@ -1393,26 -1390,21 +1392,37 @@@
  	xe_assert(xe, !IS_SRIOV_VF(xe));
  	xe_assert(xe, !pci_num_vf(pdev));
  
 +	flags = memalloc_noreclaim_save();
 +	pme_enabled = xe->pme.capable && !xe->d3cold.allowed &&
 +		      pci_enable_wake(pdev, PCI_D3hot, true) == 0;
 +	memalloc_noreclaim_restore(flags);
 +
 +	xe_pm_update_pme_enabled(xe, pme_enabled);
 +
  	err = xe_pm_runtime_suspend(xe);
 -	if (err)
 +	if (err) {
 +		if (pme_enabled) {
 +			flags = memalloc_noreclaim_save();
 +			pci_enable_wake(pdev, PCI_D3hot, false);
 +			memalloc_noreclaim_restore(flags);
 +
 +			xe_pm_update_pme_enabled(xe, false);
 +		}
 +
  		return err;
 +	}
  
+ 	err = xe_pm_wait_all_c6(xe);
+ 	if (err) {
+ 		drm_dbg(&xe->drm, "Resuming - GT C6 check failed!");
+ 		ret = xe_pm_runtime_resume(xe);
+ 		if (ret) {
+ 			drm_err(&xe->drm, "Resume failed after suspend was canceled");
+ 			return ret;
+ 		}
+ 		return err;
+ 	}
+ 
  	pci_save_state(pdev);
  
  	if (xe->d3cold.allowed) {

Attachment: signature.asc
Description: PGP signature