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

[Mark Brown]

Hi all,

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

  drivers/gpu/drm/xe/xe_guc_submit.c

between commit:

  e0f82655df6fb ("drm/xe: Trigger queue cleanup if not in wedged mode 2")

from the origin tree and commits:

  e25ba41c8227c ("drm/xe: Trigger queue cleanup if not in wedged mode 2")
  a7f607610da72 ("drm/xe: Use XE_WEDGED_MODE_UPON_ANY_HANG_NO_RESET enum instead of magic number")

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_guc_submit.c
index cb32053d57ecd,a145234f662b5..0000000000000
--- a/drivers/gpu/drm/xe/xe_guc_submit.c
+++ b/drivers/gpu/drm/xe/xe_guc_submit.c
@@@ -1334,12 -1334,13 +1334,13 @@@ void xe_guc_submit_wedge(struct xe_guc 
  	if (!guc->submission_state.initialized)
  		return;
  
- 	if (xe->wedged.mode == 2) {
+ 	if (xe->wedged.mode == XE_WEDGED_MODE_UPON_ANY_HANG_NO_RESET) {
  		err = devm_add_action_or_reset(guc_to_xe(guc)->drm.dev,
  					       guc_submit_wedged_fini, guc);
  		if (err) {
- 			xe_gt_err(gt, "Failed to register clean-up on wedged.mode=2; "
- 				  "Although device is wedged.\n");
+ 			xe_gt_err(gt, "Failed to register clean-up on wedged.mode=%s; "
+ 				  "Although device is wedged.\n",
+ 				  xe_wedged_mode_to_string(XE_WEDGED_MODE_UPON_ANY_HANG_NO_RESET));
  			return;
  		}

Attachment: signature.asc
Description: PGP signature