Hi all,

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

  drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
  drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c

between commits:

  8a93f77aec655 ("drm/amdkfd: Don't acquire buffers during CRIU queue restore.")
  47ea05f246beb ("drm/amdkfd: Check bounds on CRIU restore queue type and mqd size")

from the drm-fixes tree and commits:

  f19d8086f6644 ("drm/amdkfd: Check bounds on CRIU restore queue type and mqd size")
  1cafa8b29e029 ("drm/amdkfd: Don't acquire buffers during CRIU queue restore.")

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 --combined drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
index 641b8ada82a03,c9f9f7a871117..0000000000000
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
@@@ -333,6 -333,8 +333,8 @@@ int debug_refresh_runlist(struct device
  bool kfd_dqm_is_queue_in_process(struct device_queue_manager *dqm,
  				 struct qcm_process_device *qpd,
  				 int doorbell_off, u32 *queue_format);
+ int kfd_reset_queue_mes(struct device_queue_manager *dqm, int queue_type,
+ 			int pipe, int queue, unsigned int db);
  size_t mqd_size_from_queue_type(struct device_queue_manager *dqm,
  				enum kfd_queue_type type);
  
diff --combined drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c
index 9ccbc6e5b27b3,97e77a5a35e51..0000000000000
--- a/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c
@@@ -1055,7 -1055,7 +1055,7 @@@ int kfd_criu_restore_queue(struct kfd_p
  	ctl_stack = mqd + q_data->mqd_size;
  
  	memset(&qp, 0, sizeof(qp));
- 	set_queue_properties_from_criu(&qp, q_data, NUM_XCC(pdd->dev->adev->gfx.xcc_mask));
+ 	set_queue_properties_from_criu(&qp, q_data, NUM_XCC(pdd->dev->xcc_mask));
  
  	print_queue_properties(&qp);