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

[Stephen Rothwell]

Hi all,

On Tue, 3 Nov 2020 14:21:08 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Today's linux-next merge of the drm-misc tree got a conflict in:
> 
>   drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> 
> between commit:
> 
>   e8a982355f96 ("drm/amd/display: Add tracepoint for amdgpu_dm")
> 
> from the amdgpu tree and commit:
> 
>   29b77ad7b9ca ("drm/atomic: Pass the full state to CRTC atomic_check")
> 
> from the drm-misc 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 --cc drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> index 28dcaae06993,86fd4420f128..000000000000
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> @@@ -6003,19 -5514,19 +6003,21 @@@ static void dm_update_crtc_active_plane
>   }
>   
>   static int dm_crtc_helper_atomic_check(struct drm_crtc *crtc,
> - 				       struct drm_crtc_state *state)
> + 				       struct drm_atomic_state *state)
>   {
> + 	struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state,
> + 									  crtc);
>   	struct amdgpu_device *adev = drm_to_adev(crtc->dev);
>   	struct dc *dc = adev->dm.dc;
> - 	struct dm_crtc_state *dm_crtc_state = to_dm_crtc_state(state);
> + 	struct dm_crtc_state *dm_crtc_state = to_dm_crtc_state(crtc_state);
>   	int ret = -EINVAL;
>   
> - 	trace_amdgpu_dm_crtc_atomic_check(state);
> ++	trace_amdgpu_dm_crtc_atomic_check(crtc_state);
>  +
> - 	dm_update_crtc_active_planes(crtc, state);
> + 	dm_update_crtc_active_planes(crtc, crtc_state);
>   
>   	if (unlikely(!dm_crtc_state->stream &&
> - 		     modeset_required(state, NULL, dm_crtc_state->stream))) {
> + 		     modeset_required(crtc_state, NULL, dm_crtc_state->stream))) {
>   		WARN_ON(1);
>   		return ret;
>   	}

This is now a conflict between the drm tree and the amdgpu tree.

-- 
Cheers,
Stephen Rothwell

Attachment: pgpykCbDcpNtO.pgp
Description: OpenPGP digital signature