Subject: linux-next: manual merge of the tip tree with the drm tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 11 Apr 2023 13:59:09 +1000

Hi all,

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

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

between commit:

  3735040978a4 ("drm/i915/mtl: Synchronize i915/BIOS on C6 enabling")

from the drm tree and commit:

  f7faedffa92c ("drm/i915/gt: use __xchg instead of internal helper")

from the tip 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_rc6.c
index 8f3cd68d14f8,3d6109f1d05c..000000000000
--- a/drivers/gpu/drm/i915/gt/intel_rc6.c
+++ b/drivers/gpu/drm/i915/gt/intel_rc6.c
@@@ -733,11 -710,7 +733,11 @@@ void intel_rc6_fini(struct intel_rc6 *r
  
  	intel_rc6_disable(rc6);
  
 +	/* We want the BIOS C6 state preserved across loads for MTL */
 +	if (IS_METEORLAKE(rc6_to_i915(rc6)) && rc6->bios_state_captured)
 +		set(uncore, GEN6_RC_STATE, rc6->bios_rc_state);
 +
- 	pctx = fetch_and_zero(&rc6->pctx);
+ 	pctx = __xchg(&rc6->pctx, 0);
  	if (pctx)
  		i915_gem_object_put(pctx);