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

[Mark Brown]

Hi all,

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

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

between commit:

  bfa71b7a9dc6b ("drm/i915: Unlink NV12 planes earlier")

from the drm-intel-fixes tree and commits:

  017ecd0498557 ("drm/i915: Unlink NV12 planes earlier")
  7b3a14322d1a8 ("drm/i915: Relocate unlink_nv12_plane()")
  c5121204ad991 ("drm/i915: Skip redundant NV12 plane unlinking")

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.

diff --combined drivers/gpu/drm/i915/display/intel_plane.c
index 076b9b3564816,5390ceb21ca42..0000000000000
--- a/drivers/gpu/drm/i915/display/intel_plane.c
+++ b/drivers/gpu/drm/i915/display/intel_plane.c
@@@ -437,7 -437,29 +437,29 @@@ void intel_plane_copy_hw_state(struct i
  }
  
  static void unlink_nv12_plane(struct intel_crtc_state *crtc_state,
- 			      struct intel_plane_state *plane_state);
+ 			      struct intel_plane_state *plane_state)
+ {
+ 	struct intel_display *display = to_intel_display(plane_state);
+ 	struct intel_plane *plane = to_intel_plane(plane_state->uapi.plane);
+ 
+ 	if (!plane_state->planar_linked_plane)
+ 		return;
+ 
+ 	plane_state->planar_linked_plane = NULL;
+ 
+ 	if (!plane_state->is_y_plane)
+ 		return;
+ 
+ 	drm_WARN_ON(display->drm, plane_state->uapi.visible);
+ 
+ 	plane_state->is_y_plane = false;
+ 
+ 	crtc_state->enabled_planes &= ~BIT(plane->id);
+ 	crtc_state->active_planes &= ~BIT(plane->id);
+ 	crtc_state->update_planes |= BIT(plane->id);
+ 	crtc_state->data_rate[plane->id] = 0;
+ 	crtc_state->rel_data_rate[plane->id] = 0;
+ }
  
  void intel_plane_set_invisible(struct intel_crtc_state *crtc_state,
  			       struct intel_plane_state *plane_state)
@@@ -1512,31 -1534,6 +1534,6 @@@ static void link_nv12_planes(struct int
  	icl_link_nv12_planes(uv_plane_state, y_plane_state);
  }
  
- static void unlink_nv12_plane(struct intel_crtc_state *crtc_state,
- 			      struct intel_plane_state *plane_state)
- {
- 	struct intel_display *display = to_intel_display(plane_state);
- 	struct intel_plane *plane = to_intel_plane(plane_state->uapi.plane);
- 
- 	if (!plane_state->planar_linked_plane)
- 		return;
- 
- 	plane_state->planar_linked_plane = NULL;
- 
- 	if (!plane_state->is_y_plane)
- 		return;
- 
- 	drm_WARN_ON(display->drm, plane_state->uapi.visible);
- 
- 	plane_state->is_y_plane = false;
- 
- 	crtc_state->enabled_planes &= ~BIT(plane->id);
- 	crtc_state->active_planes &= ~BIT(plane->id);
- 	crtc_state->update_planes |= BIT(plane->id);
- 	crtc_state->data_rate[plane->id] = 0;
- 	crtc_state->rel_data_rate[plane->id] = 0;
- }
- 
  static int icl_check_nv12_planes(struct intel_atomic_state *state,
  				 struct intel_crtc *crtc)
  {
@@@ -1550,17 -1547,6 +1547,6 @@@
  	if (DISPLAY_VER(display) < 11)
  		return 0;
  
- 	/*
- 	 * Destroy all old plane links and make the Y plane invisible
- 	 * in the crtc_state->active_planes mask.
- 	 */
- 	for_each_new_intel_plane_in_state(state, plane, plane_state, i) {
- 		if (plane->pipe != crtc->pipe)
- 			continue;
- 
- 		unlink_nv12_plane(crtc_state, plane_state);
- 	}
- 
  	if (!crtc_state->nv12_planes)
  		return 0;

Attachment: signature.asc
Description: PGP signature