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

From: Stephen Rothwell <[email-masked]>
Date: Thu, 1 Apr 2021 13:13:46 +1100

Hi all,

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

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

between commit:

  1b321026e213 ("drm/i915: Pass ww ctx to intel_pin_to_display_plane")

from the drm tree and commit:

  61169987c4d9 ("drm/i915: Unify the FB and plane state view information into one struct")

from the drm-intel 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_display.c
index aa524eff20e1,bdb2adb4d748..000000000000
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@@ -1185,13 -1094,13 +1112,13 @@@ retry
  		 * mode that matches the user configuration.
  		 */
  		ret = i915_vma_pin_fence(vma);
- 		if (ret != 0 && INTEL_GEN(dev_priv) < 4) {
+ 		if (ret != 0 && DISPLAY_VER(dev_priv) < 4) {
  			i915_vma_unpin(vma);
 -			vma = ERR_PTR(ret);
 -			goto err;
 +			goto err_unpin;
  		}
 +		ret = 0;
  
 -		if (ret == 0 && vma->fence)
 +		if (vma->fence)
  			*out_flags |= PLANE_HAS_FENCE;
  	}
  
@@@ -11363,12 -10508,20 +10536,12 @@@ int intel_plane_pin_fb(struct intel_pla
  	struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
  	struct drm_framebuffer *fb = plane_state->hw.fb;
  	struct i915_vma *vma;
 +	bool phys_cursor =
 +		plane->id == PLANE_CURSOR &&
 +		INTEL_INFO(dev_priv)->display.cursor_needs_physical;
  
 -	if (plane->id == PLANE_CURSOR &&
 -	    INTEL_INFO(dev_priv)->display.cursor_needs_physical) {
 -		struct drm_i915_gem_object *obj = intel_fb_obj(fb);
 -		const int align = intel_cursor_alignment(dev_priv);
 -		int err;
 -
 -		err = i915_gem_object_attach_phys(obj, align);
 -		if (err)
 -			return err;
 -	}
 -
 -	vma = intel_pin_and_fence_fb_obj(fb,
 +	vma = intel_pin_and_fence_fb_obj(fb, phys_cursor,
- 					 &plane_state->view,
+ 					 &plane_state->view.gtt,
  					 intel_plane_uses_fence(plane_state),
  					 &plane_state->flags);
  	if (IS_ERR(vma))