linux-next: manual merge of the drm tree with Linus' tree

[Stephen Rothwell]

Hi all,

FIXME: Add owner of second tree to To:
       Add author(s)/SOB of conflicting commits.

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

  drivers/gpu/drm/xe/xe_exec_queue.c
  drivers/gpu/drm/xe/xe_exec_queue_types.h

between commit:

  eaa367a0317e ("drm/xe/uapi: Remove unused flags")

from Linus' tree and commits:

  25ce7c5063b3 ("drm/xe: Finish refactoring of exec_queue_create")
  f1a9abc0cf31 ("drm/xe/uapi: Remove support for persistent exec_queues")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/gpu/drm/xe/xe_exec_queue.c
index 49223026c89f,4bb8f897bf15..000000000000
--- a/drivers/gpu/drm/xe/xe_exec_queue.c
+++ b/drivers/gpu/drm/xe/xe_exec_queue.c
@@@ -306,9 -347,98 +347,13 @@@ static int exec_queue_set_timeslice(str
  	    !xe_hw_engine_timeout_in_range(value, min, max))
  		return -EINVAL;
  
- 	return q->ops->set_timeslice(q, value);
+ 	if (!create)
+ 		return q->ops->set_timeslice(q, value);
+ 
+ 	q->sched_props.timeslice_us = value;
+ 	return 0;
  }
  
 -static int exec_queue_set_preemption_timeout(struct xe_device *xe,
 -					     struct xe_exec_queue *q, u64 value,
 -					     bool create)
 -{
 -	u32 min = 0, max = 0;
 -
 -	xe_exec_queue_get_prop_minmax(q->hwe->eclass,
 -				      XE_EXEC_QUEUE_PREEMPT_TIMEOUT, &min, &max);
 -
 -	if (xe_exec_queue_enforce_schedule_limit() &&
 -	    !xe_hw_engine_timeout_in_range(value, min, max))
 -		return -EINVAL;
 -
 -	if (!create)
 -		return q->ops->set_preempt_timeout(q, value);
 -
 -	q->sched_props.preempt_timeout_us = value;
 -	return 0;
 -}
 -
 -static int exec_queue_set_job_timeout(struct xe_device *xe, struct xe_exec_queue *q,
 -				      u64 value, bool create)
 -{
 -	u32 min = 0, max = 0;
 -
 -	if (XE_IOCTL_DBG(xe, !create))
 -		return -EINVAL;
 -
 -	xe_exec_queue_get_prop_minmax(q->hwe->eclass,
 -				      XE_EXEC_QUEUE_JOB_TIMEOUT, &min, &max);
 -
 -	if (xe_exec_queue_enforce_schedule_limit() &&
 -	    !xe_hw_engine_timeout_in_range(value, min, max))
 -		return -EINVAL;
 -
 -	q->sched_props.job_timeout_ms = value;
 -
 -	return 0;
 -}
 -
 -static int exec_queue_set_acc_trigger(struct xe_device *xe, struct xe_exec_queue *q,
 -				      u64 value, bool create)
 -{
 -	if (XE_IOCTL_DBG(xe, !create))
 -		return -EINVAL;
 -
 -	if (XE_IOCTL_DBG(xe, !xe->info.has_usm))
 -		return -EINVAL;
 -
 -	q->usm.acc_trigger = value;
 -
 -	return 0;
 -}
 -
 -static int exec_queue_set_acc_notify(struct xe_device *xe, struct xe_exec_queue *q,
 -				     u64 value, bool create)
 -{
 -	if (XE_IOCTL_DBG(xe, !create))
 -		return -EINVAL;
 -
 -	if (XE_IOCTL_DBG(xe, !xe->info.has_usm))
 -		return -EINVAL;
 -
 -	q->usm.acc_notify = value;
 -
 -	return 0;
 -}
 -
 -static int exec_queue_set_acc_granularity(struct xe_device *xe, struct xe_exec_queue *q,
 -					  u64 value, bool create)
 -{
 -	if (XE_IOCTL_DBG(xe, !create))
 -		return -EINVAL;
 -
 -	if (XE_IOCTL_DBG(xe, !xe->info.has_usm))
 -		return -EINVAL;
 -
 -	if (value > DRM_XE_ACC_GRANULARITY_64M)
 -		return -EINVAL;
 -
 -	q->usm.acc_granularity = value;
 -
 -	return 0;
 -}
 -
  typedef int (*xe_exec_queue_set_property_fn)(struct xe_device *xe,
  					     struct xe_exec_queue *q,
  					     u64 value, bool create);
diff --cc drivers/gpu/drm/xe/xe_exec_queue_types.h
index 36f4901d8d7e,c40240e88068..000000000000
--- a/drivers/gpu/drm/xe/xe_exec_queue_types.h
+++ b/drivers/gpu/drm/xe/xe_exec_queue_types.h
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <https://lists.freedesktop.org/archives/dri-devel/attachments/20240304/d84a546d/attachment.sig>