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

From: Stephen Rothwell <[email-masked]>
Date: Wed, 3 Jun 2020 09:08:16 +1000

Hi all,

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

  drivers/gpu/drm/i915/gt/intel_lrc.c

between commit:

  f53ae29c0ea1 ("drm/i915/gt: Include a few tracek for timeslicing")

from Linus' tree and commit:

  00febf644648 ("drm/i915/gt: Incorporate the virtual engine into timeslicing")

from the drm-intel-fixes 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/i915/gt/intel_lrc.c
index 87e6c5bdd2dc,e77f89b43e5f..000000000000
--- a/drivers/gpu/drm/i915/gt/intel_lrc.c
+++ b/drivers/gpu/drm/i915/gt/intel_lrc.c
@@@ -1971,20 -1853,12 +1990,19 @@@ static void set_timeslice(struct intel_
  	if (!intel_engine_has_timeslices(engine))
  		return;
  
 -	set_timer_ms(&engine->execlists.timer, active_timeslice(engine));
 +	duration = active_timeslice(engine);
 +	ENGINE_TRACE(engine, "bump timeslicing, interval:%lu", duration);
 +
 +	set_timer_ms(&engine->execlists.timer, duration);
  }
  
- static void start_timeslice(struct intel_engine_cs *engine)
+ static void start_timeslice(struct intel_engine_cs *engine, int prio)
  {
  	struct intel_engine_execlists *execlists = &engine->execlists;
- 	const int prio = queue_prio(execlists);
 +	unsigned long duration;
 +
 +	if (!intel_engine_has_timeslices(engine))
 +		return;
  
  	WRITE_ONCE(execlists->switch_priority_hint, prio);
  	if (prio == INT_MIN)
@@@ -2140,13 -1994,8 +2158,13 @@@ static void execlists_dequeue(struct in
  			__unwind_incomplete_requests(engine);
  
  			last = NULL;
- 		} else if (need_timeslice(engine, last) &&
+ 		} else if (need_timeslice(engine, last, rb) &&
  			   timeslice_expired(execlists, last)) {
 +			if (i915_request_completed(last)) {
 +				tasklet_hi_schedule(&execlists->tasklet);
 +				return;
 +			}
 +
  			ENGINE_TRACE(engine,
  				     "expired last=%llx:%lld, prio=%d, hint=%d, yield?=%s\n",
  				     last->fence.context,