Merge v5.6-rc5 into drm-next

[linux-2.6-microblaze.git] / drivers / gpu / drm / amd / display / amdgpu_dm / amdgpu_dm_mst_types.c

diff --git 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
index da73161..4837640 100644 (file)
--- 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
@@ -154,15 +154,18 @@ amdgpu_dm_mst_connector_late_register(struct drm_connector *connector)
 {
        struct amdgpu_dm_connector *amdgpu_dm_connector =
                to_amdgpu_dm_connector(connector);
-       struct drm_dp_mst_port *port = amdgpu_dm_connector->port;
+       int r;
+
+       amdgpu_dm_connector->dm_dp_aux.aux.dev = connector->kdev;
+       r = drm_dp_aux_register(&amdgpu_dm_connector->dm_dp_aux.aux);
+       if (r)
+               return r;
 
 #if defined(CONFIG_DEBUG_FS)
        connector_debugfs_init(amdgpu_dm_connector);
-       amdgpu_dm_connector->debugfs_dpcd_address = 0;
-       amdgpu_dm_connector->debugfs_dpcd_size = 0;
 #endif
 
-       return drm_dp_mst_connector_late_register(connector, port);
+       return r;
 }
 
 static void
@@ -483,11 +486,10 @@ void amdgpu_dm_initialize_dp_connector(struct amdgpu_display_manager *dm,
                                       struct amdgpu_dm_connector *aconnector)
 {
        aconnector->dm_dp_aux.aux.name = "dmdc";
-       aconnector->dm_dp_aux.aux.dev = aconnector->base.kdev;
        aconnector->dm_dp_aux.aux.transfer = dm_dp_aux_transfer;
        aconnector->dm_dp_aux.ddc_service = aconnector->dc_link->ddc;
 
-       drm_dp_aux_register(&aconnector->dm_dp_aux.aux);
+       drm_dp_aux_init(&aconnector->dm_dp_aux.aux);
        drm_dp_cec_register_connector(&aconnector->dm_dp_aux.aux,
                                      &aconnector->base);