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

[Stephen Rothwell]

Hi all,

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

  drivers/gpu/drm/xe/xe_ggtt.c

between commit:

  af2b588abe00 ("drm/xe: Process deferred GGTT node removals on device unwind")

from the drm-fixes tree and commit:

  b2d6fd7ac598 ("drm/xe: Do not rely on GGTT internals in xe_guc_buf kunit tests")

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_ggtt.c
index 2c799958c1e4,7b11fa1356f0..000000000000
--- a/drivers/gpu/drm/xe/xe_ggtt.c
+++ b/drivers/gpu/drm/xe/xe_ggtt.c
@@@ -201,13 -222,22 +222,29 @@@ static const struct xe_ggtt_pt_ops xelp
  	.ggtt_set_pte = xe_ggtt_set_pte_and_flush,
  };
  
 +static void dev_fini_ggtt(void *arg)
 +{
 +	struct xe_ggtt *ggtt = arg;
 +
 +	drain_workqueue(ggtt->wq);
 +}
 +
+ static void __xe_ggtt_init_early(struct xe_ggtt *ggtt, u32 reserved)
+ {
+ 	drm_mm_init(&ggtt->mm, reserved,
+ 		    ggtt->size - reserved);
+ 	mutex_init(&ggtt->lock);
+ 	primelockdep(ggtt);
+ }
+ 
+ int xe_ggtt_init_kunit(struct xe_ggtt *ggtt, u32 reserved, u32 size)
+ {
+ 	ggtt->size = size;
+ 	__xe_ggtt_init_early(ggtt, reserved);
+ 	return 0;
+ }
+ EXPORT_SYMBOL_IF_KUNIT(xe_ggtt_init_kunit);
+ 
  /**
   * xe_ggtt_init_early - Early GGTT initialization
   * @ggtt: the &xe_ggtt to be initialized
@@@ -264,12 -290,8 +297,12 @@@ int xe_ggtt_init_early(struct xe_ggtt *
  	if (err)
  		return err;
  
 +	err = devm_add_action_or_reset(xe->drm.dev, dev_fini_ggtt, ggtt);
 +	if (err)
 +		return err;
 +
  	if (IS_SRIOV_VF(xe)) {
- 		err = xe_gt_sriov_vf_prepare_ggtt(xe_tile_get_gt(ggtt->tile, 0));
+ 		err = xe_tile_sriov_vf_prepare_ggtt(ggtt->tile);
  		if (err)
  			return err;
  	}

Attachment: pgpQsj0ThDeuY.pgp
Description: OpenPGP digital signature