linux-next: manual merge of the amdgpu tree with the drm tree

[Mark Brown]

Hi all,

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

  drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

between commit:

  a2b270c0ecf6d ("drm/amdgpu: initialize irq.lock spinlock earlier")

from the drm tree and commits:

  7dba3e10ecdee ("drm/amdgpu: initialize irq.lock spinlock earlier")
  6eadd448d7e7d ("drm/amdgpu: Choose SOC15 RLC register read write functions at init time")

from the amdgpu 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/amd/amdgpu/amdgpu_device.c
index 211d30f03d25f,c66d3a24f54e8..0000000000000
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@@ -3677,6 -3677,10 +3677,10 @@@ static void amdgpu_device_sys_interface
  		amdgpu_pm_sysfs_fini(adev);
  	if (adev->ucode_sysfs_en)
  		amdgpu_ucode_sysfs_fini(adev);
+ 
+ 	amdgpu_discovery_sysfs_fini(adev);
+ 	amdgpu_preempt_mgr_sysfs_fini(adev);
+ 
  	amdgpu_device_attr_sysfs_fini(adev);
  	amdgpu_fru_sysfs_fini(adev);
  
@@@ -3773,6 -3777,7 +3777,7 @@@ int amdgpu_device_init(struct amdgpu_de
  
  	spin_lock_init(&adev->irq.lock);
  
+ 	amdgpu_early_init_rlc_reg_funcs(adev);
  	amdgpu_device_init_apu_flags(adev);
  
  	r = amdgpu_device_check_arguments(adev);
@@@ -4210,6 -4215,7 +4215,7 @@@ void amdgpu_device_fini_hw(struct amdgp
  
  	if (adev->mman.initialized)
  		drain_workqueue(adev->mman.bdev.wq);
+ 
  	adev->shutdown = true;
  
  	unregister_pm_notifier(&adev->pm_nb);

Attachment: signature.asc
Description: PGP signature