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

Hi all,

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

  drivers/gpu/drm/xe/xe_device.c

between commit:

  ef526d122b62a ("drm/xe: Fix xe_device_probe() failure")

from the drm-fixes tree and commits:

  5ce3042c67c53 ("drm/xe: Fix xe_device_probe() failure")
  20bc4883c7c0e ("drm/xe/ras: Fix boot-time ras error processing")

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 --combined drivers/gpu/drm/xe/xe_device.c
index 2bf38a7684c64,71111ad324658..0000000000000
--- a/drivers/gpu/drm/xe/xe_device.c
+++ b/drivers/gpu/drm/xe/xe_device.c
@@@ -282,7 -282,7 +282,7 @@@ static vm_fault_t barrier_fault(struct 
  	pgprot_t prot;
  	int idx;
  
 -	prot = vm_get_page_prot(vma->vm_flags);
 +	prot = vma_get_page_prot(vma);
  
  	if (drm_dev_enter(dev, &idx)) {
  		unsigned long pfn;
@@@ -331,7 -331,7 +331,7 @@@ static int xe_pci_barrier_mmap(struct f
  	if (vma->vm_end - vma->vm_start > SZ_4K)
  		return -EINVAL;
  
 -	if (is_cow_mapping(vma->vm_flags))
 +	if (vma_is_cow_mapping(vma))
  		return -EINVAL;
  
  	if (vma->vm_flags & (VM_READ | VM_EXEC))
@@@ -513,6 -513,17 +513,17 @@@ struct xe_device *xe_device_create(stru
  }
  ALLOW_ERROR_INJECTION(xe_device_create, ERRNO); /* See xe_pci_probe() */
  
+ static void xe_device_parse_modparam(struct xe_device *xe)
+ {
+ 	xe->atomic_svm_timeslice_ms = 5;
+ 	xe->min_run_period_lr_ms = 5;
+ 	xe->info.num_pf_work = xe_modparam.num_pf_work;
+ 	if (xe->info.num_pf_work < 1)
+ 		xe->info.num_pf_work = 1;
+ 	else if (xe->info.num_pf_work > XE_PAGEFAULT_WORK_MAX)
+ 		xe->info.num_pf_work = XE_PAGEFAULT_WORK_MAX;
+ }
+ 
  /**
   * xe_device_init_early() - Initialize a new &xe_device instance
   * @xe: the &xe_device to initialize
@@@ -539,8 -550,7 +550,7 @@@ int xe_device_init_early(struct xe_devi
  	if (err)
  		return err;
  
- 	xe->atomic_svm_timeslice_ms = 5;
- 	xe->min_run_period_lr_ms = 5;
+ 	xe_device_parse_modparam(xe);
  
  	err = xe_irq_init(xe);
  	if (err)
@@@ -1141,6 -1151,13 +1151,13 @@@ int xe_device_probe(struct xe_device *x
  	if (err)
  		goto err_unregister_display;
  
+ 	/*
+ 	 * Process and log any errors detected by hardware. Possible results can
+ 	 * include declaring the device as wedged, which must be done only after
+ 	 * xe_device_wedged_fini() is registered.
+ 	 */
+ 	xe_ras_process_errors(xe);
+ 
  	err = devm_add_action_or_reset(xe->drm.dev, xe_device_sanitize, xe);
  	if (err)
  		goto err_unregister_display;

-----BEGIN PGP SIGNATURE-----

iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmp/PnsACgkQJNaLcl1U
h9CJngf+LN+wwQNpQMyo4dyiLgR68aNcK5+6kb7sONHNDk3f21ll2VEMUb3Y/Z0L
MeMRIGYvqBP8gRs6Zx6hjhcmA9yXGPU8VwciL7xJ7HljQLLBDdU59Ow7O3CFOlvF
68KrwgReukxv2AfL9dHTvcwhqz97P0ErT9NntsHhRWHPvTIB/kcv/bC0+aqPw4yi
rmczDwN7f+UX8usUQyzbZ0CTM/yfZHxHXH4iaqxGrRNCLYMiNqxMQHaL5FqRsdN/
Fi1Ii1r+wBvq8L4bnUXmhx2PHHosrnBd1ee7C0IJUdmLX37Pg3eL1Z286UB8OXZd
jEXxUl4yWaMm8Q2SKOU1/GLVaTVnpw==
=+y20
-----END PGP SIGNATURE-----