OSDN Git Service

drm/amd/display: Fix debugfs on MST connectors
authorMikita Lipski <mikita.lipski@amd.com>
Thu, 31 Oct 2019 20:09:01 +0000 (16:09 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 22 Nov 2019 19:35:10 +0000 (14:35 -0500)
[why]
Previous patch allowed to initialize debugfs entries on both MST
and SST connectors, but MST connectors get registered much later
which exposed an issue of debugfs entries being initialized in the
same folder.

[how]
Return SST debugfs entries' initialization back to where it was.
For MST connectors we should initialize debugfs entries in connector
register function after the connector is registered.

Signed-off-by: Mikita Lipski <mikita.lipski@amd.com>
Reviewed-by: Nicholas Kazlauskas <Nicholas.Kazlauskas@amd.com>
Acked-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c

index 49cf397..2bf8534 100644 (file)
@@ -36,7 +36,9 @@
 #include "dc_link_ddc.h"
 
 #include "i2caux_interface.h"
-
+#if defined(CONFIG_DEBUG_FS)
+#include "amdgpu_dm_debugfs.h"
+#endif
 /* #define TRACE_DPCD */
 
 #ifdef TRACE_DPCD
@@ -147,6 +149,12 @@ amdgpu_dm_mst_connector_late_register(struct drm_connector *connector)
                to_amdgpu_dm_connector(connector);
        struct drm_dp_mst_port *port = amdgpu_dm_connector->port;
 
+#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);
 }