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

[Stephen Rothwell]

Hi all,

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

  drivers/gpu/drm/vc4/vc4_plane.c

between commit:

  35d65ab3fdba ("drm/vc4: plane: Remove redundant assignment")

from the drm-misc-fixes tree and commit:

  5ddb0bd4ddc3 ("drm/atomic: Pass the full state to planes async atomic check and update")

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/vc4/vc4_plane.c
index 1e9c84cf614a,c76e73a452e0..000000000000
--- a/drivers/gpu/drm/vc4/vc4_plane.c
+++ b/drivers/gpu/drm/vc4/vc4_plane.c
@@@ -1133,31 -1135,34 +1135,33 @@@ void vc4_plane_async_set_fb(struct drm_
  }
  
  static void vc4_plane_atomic_async_update(struct drm_plane *plane,
- 					  struct drm_plane_state *state)
+ 					  struct drm_atomic_state *state)
  {
+ 	struct drm_plane_state *new_plane_state = drm_atomic_get_new_plane_state(state,
+ 										 plane);
  	struct vc4_plane_state *vc4_state, *new_vc4_state;
  
- 	swap(plane->state->fb, state->fb);
- 	plane->state->crtc_x = state->crtc_x;
- 	plane->state->crtc_y = state->crtc_y;
- 	plane->state->crtc_w = state->crtc_w;
- 	plane->state->crtc_h = state->crtc_h;
- 	plane->state->src_x = state->src_x;
- 	plane->state->src_y = state->src_y;
- 	plane->state->src_w = state->src_w;
- 	plane->state->src_h = state->src_h;
- 	plane->state->alpha = state->alpha;
- 	plane->state->pixel_blend_mode = state->pixel_blend_mode;
- 	plane->state->rotation = state->rotation;
- 	plane->state->zpos = state->zpos;
- 	plane->state->normalized_zpos = state->normalized_zpos;
- 	plane->state->color_encoding = state->color_encoding;
- 	plane->state->color_range = state->color_range;
- 	plane->state->src = state->src;
- 	plane->state->dst = state->dst;
- 	plane->state->visible = state->visible;
- 
- 	new_vc4_state = to_vc4_plane_state(state);
+ 	swap(plane->state->fb, new_plane_state->fb);
+ 	plane->state->crtc_x = new_plane_state->crtc_x;
+ 	plane->state->crtc_y = new_plane_state->crtc_y;
+ 	plane->state->crtc_w = new_plane_state->crtc_w;
+ 	plane->state->crtc_h = new_plane_state->crtc_h;
+ 	plane->state->src_x = new_plane_state->src_x;
+ 	plane->state->src_y = new_plane_state->src_y;
+ 	plane->state->src_w = new_plane_state->src_w;
+ 	plane->state->src_h = new_plane_state->src_h;
 -	plane->state->src_h = new_plane_state->src_h;
+ 	plane->state->alpha = new_plane_state->alpha;
+ 	plane->state->pixel_blend_mode = new_plane_state->pixel_blend_mode;
+ 	plane->state->rotation = new_plane_state->rotation;
+ 	plane->state->zpos = new_plane_state->zpos;
+ 	plane->state->normalized_zpos = new_plane_state->normalized_zpos;
+ 	plane->state->color_encoding = new_plane_state->color_encoding;
+ 	plane->state->color_range = new_plane_state->color_range;
+ 	plane->state->src = new_plane_state->src;
+ 	plane->state->dst = new_plane_state->dst;
+ 	plane->state->visible = new_plane_state->visible;
+ 
+ 	new_vc4_state = to_vc4_plane_state(new_plane_state);
  	vc4_state = to_vc4_plane_state(plane->state);
  
  	vc4_state->crtc_x = new_vc4_state->crtc_x;

Attachment: pgprJPwAVy4iM.pgp
Description: OpenPGP digital signature