Hi all,

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

  drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c

between commit:

  63e19ef3ddab8 ("drm/amd/display: Atomize IRQ register read/modify/write ops")

from the drm-fixes tree and commit:

  63e19ef3ddab8 ("drm/amd/display: Atomize IRQ register read/modify/write ops")

from the drm 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/amd/display/amdgpu_dm/amdgpu_dm_irq.c
index 74a8735168aaa,f997a50c1293e..0000000000000
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c
@@@ -728,7 -713,12 +731,12 @@@ STATIC_IFN_KUNIT int amdgpu_dm_irq_hand
  			entry->src_id,
  			entry->src_data[0]);
  
+ 	if (!DAL_VALID_IRQ_SRC_NUM(src)) {
+ 		DRM_ERROR("DM_IRQ: invalid irq_source:%d!\n", src);
+ 		return 0;
+ 	}
+ 
 -	dc_interrupt_ack(adev->dm.dc, src);
 +	amdgpu_dm_irq_ack(adev, src);
  
  	/* Call high irq work immediately */
  	amdgpu_dm_irq_immediate_work(adev, src);