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

From: Stephen Rothwell <[email-masked]>
Date: Thu, 2 Dec 2021 11:30:25 +1100

Hi all,

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

  drivers/gpu/drm/i915/display/intel_fbc.c

between commit:

  d06188234427 ("drm/i915/fbc: s/dev_priv/i915/")

from the drm-intel tree and commit:

  cca084692394 ("drm/i915: Use per device iommu check")

from the drm-intel-gt 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/display/intel_fbc.c
index d0c34bc3af6c,c40444206425..000000000000
--- a/drivers/gpu/drm/i915/display/intel_fbc.c
+++ b/drivers/gpu/drm/i915/display/intel_fbc.c
@@@ -1674,12 -1536,12 +1674,12 @@@ static int intel_sanitize_fbc_option(st
  	return 0;
  }
  
 -static bool need_fbc_vtd_wa(struct drm_i915_private *dev_priv)
 +static bool need_fbc_vtd_wa(struct drm_i915_private *i915)
  {
  	/* WaFbcTurnOffFbcWhenHyperVisorIsUsed:skl,bxt */
- 	if (intel_vtd_active() &&
 -	if (intel_vtd_active(dev_priv) &&
 -	    (IS_SKYLAKE(dev_priv) || IS_BROXTON(dev_priv))) {
 -		drm_info(&dev_priv->drm,
++	if (intel_vtd_active(i915) &&
 +	    (IS_SKYLAKE(i915) || IS_BROXTON(i915))) {
 +		drm_info(&i915->drm,
  			 "Disabling framebuffer compression (FBC) to prevent screen flicker with VT-d enabled\n");
  		return true;
  	}