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

[Mark Brown <broonie@kernel.org>]

[-- Attachment #1: Type: text/plain, Size: 2976 bytes --]

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:

  347ccc0453fca ("drm/xe: fix job timeout recovery for unstarted jobs and kernel queues")

from the origin tree and commit:

  b1107d085e7e8 ("drm/xe: fix job timeout recovery for unstarted jobs and kernel queues")
  a889e9b06bfdb ("drm/xe: wedge from the timeout handler only after releasing the queue")

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 12a410458df6f,afe5d99cdd8bc..0000000000000
--- a/drivers/gpu/drm/xe/xe_guc_submit.c
+++ b/drivers/gpu/drm/xe/xe_guc_submit.c
@@@ -1493,7 -1493,7 +1493,7 @@@ guc_exec_queue_timedout_job(struct drm_
  	struct xe_device *xe = guc_to_xe(guc);
  	int err = -ETIME;
  	pid_t pid = -1;
- 	bool wedged = false, skip_timeout_check;
+ 	bool wedged = false, wedge_device = false, skip_timeout_check;
  
  	xe_gt_assert(guc_to_gt(guc), !exec_queue_destroyed(q));
  
@@@ -1638,7 -1638,7 +1638,7 @@@ trigger_reset
  			}
  			if (q->flags & EXEC_QUEUE_FLAG_KERNEL) {
  				xe_gt_WARN(q->gt, true, "Kernel-submitted job timed out\n");
- 				xe_device_declare_wedged(gt_to_xe(q->gt));
+ 				wedge_device = true;
  			}
  		} else if (q->flags & EXEC_QUEUE_FLAG_VM && !exec_queue_killed(q)) {
  			xe_gt_WARN(q->gt, true, "VM job timed out on non-killed execqueue\n");
@@@ -1658,6 -1658,9 +1658,9 @@@
  		xe_guc_exec_queue_trigger_cleanup(q);
  	}
  
+ 	if (wedge_device)
+ 		xe_device_declare_wedged(gt_to_xe(q->gt));
+ 
  	/*
  	 * We want the job added back to the pending list so it gets freed; this
  	 * is what DRM_GPU_SCHED_STAT_NO_HANG does.
@@@ -2241,14 -2244,6 +2244,6 @@@ static bool guc_exec_queue_reset_status
  	return exec_queue_reset(q) || exec_queue_killed_or_banned_or_wedged(q);
  }
  
- static bool guc_exec_queue_active(struct xe_exec_queue *q)
- {
- 	struct xe_exec_queue *primary = xe_exec_queue_multi_queue_primary(q);
- 
- 	return exec_queue_enabled(primary) &&
- 		!exec_queue_pending_disable(primary);
- }
- 
  /*
   * All of these functions are an abstraction layer which other parts of Xe can
   * use to trap into the GuC backend. All of these functions, aside from init,
@@@ -2268,7 -2263,6 +2263,6 @@@ static const struct xe_exec_queue_ops g
  	.suspend_wait = guc_exec_queue_suspend_wait,
  	.resume = guc_exec_queue_resume,
  	.reset_status = guc_exec_queue_reset_status,
- 	.active = guc_exec_queue_active,
  };
  
  static void guc_exec_queue_stop(struct xe_guc *guc, struct xe_exec_queue *q)

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]