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

Message ID 20200108120450.33ec0fdd@canb.auug.org.au
State New
Headers show
Series
  • linux-next: manual merge of the drm tree with the drm-intel-fixes tree
Related show

Commit Message

Stephen Rothwell Jan. 8, 2020, 1:04 a.m. UTC
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.

Comments

Stephen Rothwell Jan. 8, 2020, 2:28 a.m. UTC | #1
Hi all,

On Wed, 8 Jan 2020 12:04:50 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
>  -		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))

I see from the drm-intel tree that this should have not have the '!'.
I have fixed up my resolution for tomorrow (and it has been fixed for
today's linux-next in the merge of the drm-intel tree.

Patch
diff mbox series

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