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

From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Dave Airlie <airlied@linux.ie>,
	DRI <dri-devel@lists.freedesktop.org>,
	Daniel Vetter <daniel.vetter@ffwll.ch>,
	Jani Nikula <jani.nikula@linux.intel.com>,
	Joonas Lahtinen <joonas.lahtinen@linux.intel.com>,
	Rodrigo Vivi <rodrigo.vivi@intel.com>,
	Intel Graphics <intel-gfx@lists.freedesktop.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Chris Wilson <chris@chris-wilson.co.uk>
Subject: linux-next: manual merge of the drm tree with the drm-intel-fixes tree
Date: Wed, 8 Jan 2020 12:04:50 +1100	[thread overview]
Message-ID: <20200108120450.33ec0fdd@canb.auug.org.au> (raw)

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

Hi all,

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

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

between commit:

  103309977589 ("drm/i915/gt: Do not restore invalid RS state")

from the drm-intel-fixes tree and commit:

  3cd6e8860ecd ("drm/i915/gen7: Re-enable full-ppgtt for ivb & hsw")
  f997056d5b17 ("drm/i915/gt: Push the flush_pd before the set-context")
  f70de8d2ca6b ("drm/i915/gt: Track the context validity explicitly")
  902eb748e5c3 ("drm/i915/gt: Tidy up full-ppgtt on Ivybridge")

from the drm tree.

I fixed it up (I think - 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_ring_submission.c
index 93026217c121,81f872f9ef03..000000000000

--- a/drivers/gpu/drm/i915/gt/intel_ring_submission.c
+++ b/drivers/gpu/drm/i915/gt/intel_ring_submission.c
@@@ -1574,28 -1602,20 +1594,26 @@@ static int switch_context(struct i915_r
  
  	GEM_BUG_ON(HAS_EXECLISTS(rq->i915));
  
- 	if (vm) {
- 		ret = load_pd_dir(rq, i915_vm_to_ppgtt(vm));
- 		if (ret)
- 			return ret;
- 	}
+ 	ret = switch_mm(rq, vm_alias(ce));
+ 	if (ret)
+ 		return ret;
  
  	if (ce->state) {
 -		u32 hw_flags;
 +		u32 flags;
  
  		GEM_BUG_ON(rq->engine->id != RCS0);
  
 -		hw_flags = 0;
 +		/* For resource streamer on HSW+ and power context elsewhere */
 +		BUILD_BUG_ON(HSW_MI_RS_SAVE_STATE_EN != MI_SAVE_EXT_STATE_EN);
 +		BUILD_BUG_ON(HSW_MI_RS_RESTORE_STATE_EN != MI_RESTORE_EXT_STATE_EN);
 +
 +		flags = MI_SAVE_EXT_STATE_EN | MI_MM_SPACE_GTT;
- 		if (!i915_gem_context_is_kernel(rq->gem_context))
+ 		if (!test_bit(CONTEXT_VALID_BIT, &ce->flags))
 -			hw_flags = MI_RESTORE_INHIBIT;
 +			flags |= MI_RESTORE_EXT_STATE_EN;
 +		else
 +			flags |= MI_RESTORE_INHIBIT;
  
 -		ret = mi_set_context(rq, hw_flags);
 +		ret = mi_set_context(rq, flags);
  		if (ret)
  			return ret;
  	}

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