Hi all,

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

  drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c

between commit:

  09b974e8983a ("drm/amd/amdgpu_dm/mst: Remove ->destroy_connector() callback")

from the drm tree and commit:

  c33f212c0c92 ("drm/amdgpu/display: create fake mst encoders ahead of time")

from the amdgpu 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/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
index 3db1ec35d2b4,4f0072a9396b..000000000000
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
@@@ -136,23 -93,14 +93,20 @@@ static ssize_t dm_dp_aux_transfer(struc
  static void
  dm_dp_mst_connector_destroy(struct drm_connector *connector)
  {
 -	struct amdgpu_dm_connector *amdgpu_dm_connector = to_amdgpu_dm_connector(connector);
 +	struct amdgpu_dm_connector *aconnector =
 +		to_amdgpu_dm_connector(connector);
- 	struct amdgpu_encoder *amdgpu_encoder = aconnector->mst_encoder;
 +
 +	if (aconnector->dc_sink) {
 +		dc_link_remove_remote_sink(aconnector->dc_link,
 +					   aconnector->dc_sink);
 +		dc_sink_release(aconnector->dc_sink);
 +	}
  
 -	kfree(amdgpu_dm_connector->edid);
 -	amdgpu_dm_connector->edid = NULL;
 +	kfree(aconnector->edid);
  
- 	drm_encoder_cleanup(&amdgpu_encoder->base);
- 	kfree(amdgpu_encoder);
  	drm_connector_cleanup(connector);
 -	drm_dp_mst_put_port_malloc(amdgpu_dm_connector->port);
 -	kfree(amdgpu_dm_connector);
 +	drm_dp_mst_put_port_malloc(aconnector->port);
 +	kfree(aconnector);
  }
  
  static int
@@@ -412,10 -358,11 +364,19 @@@ dm_dp_add_mst_connector(struct drm_dp_m
  		master->dc_link,
  		master->connector_id);
  
- 	aconnector->mst_encoder = dm_dp_create_fake_mst_encoder(master);
- 	drm_connector_attach_encoder(&aconnector->base,
- 				     &aconnector->mst_encoder->base);
+ 	for (i = 0; i < AMDGPU_DM_MAX_CRTC; i++) {
+ 		drm_connector_attach_encoder(&aconnector->base,
+ 					     &aconnector->mst_encoders[i].base);
+ 	}
+ 
++	connector->max_bpc_property = master->base.max_bpc_property;
++	if (connector->max_bpc_property)
++		drm_connector_attach_max_bpc_property(connector, 8, 16);
++
++	connector->vrr_capable_property = master->base.vrr_capable_property;
++	if (connector->vrr_capable_property)
++		drm_connector_attach_vrr_capable_property(connector);
 +
  	connector->max_bpc_property = master->base.max_bpc_property;
  	if (connector->max_bpc_property)
  		drm_connector_attach_max_bpc_property(connector, 8, 16);