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

[Stephen Rothwell <sfr@canb.auug.org.au>]

Hi Dave,

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

  drivers/gpu/drm/i915/i915_gem_context.c

between commit:

  590379aef2e3 ("drm/i915: make context status notifier head be per engine")

from the drm-intel-fixes tree and commits:

  2355cf088d46 ("drm/i915: Create context desc template when context is created")
  949e8ab3a94b ("drm/i915: Use the size/type of address space to make decisions")

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/i915/i915_gem_context.c
index e2d83b6d376b,baceca14f5e0..000000000000
--- a/drivers/gpu/drm/i915/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/i915_gem_context.c
@@@ -309,8 -316,9 +316,8 @@@ __create_hw_context(struct drm_i915_pri
  
  	i915_gem_context_set_bannable(ctx);
  	ctx->ring_size = 4 * PAGE_SIZE;
- 	ctx->desc_template = GEN8_CTX_ADDRESSING_MODE(dev_priv) <<
- 			     GEN8_CTX_ADDRESSING_MODE_SHIFT;
+ 	ctx->desc_template =
+ 		default_desc_template(dev_priv, dev_priv->mm.aliasing_ppgtt);
 -	ATOMIC_INIT_NOTIFIER_HEAD(&ctx->status_notifier);
  
  	/* GuC requires the ring to be placed above GUC_WOPCM_TOP. If GuC is not
  	 * present or not in use we still need a small bias as ring wraparound
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx