drm/amdgpu/display: fix aux registration
Subsystems (3)
PATCH 1/2 drm/amdgpu/display: fix aux registration
We were registering the aux device in the MST late_register rather than the regular one.
Fixes 405a1f9090d1ac ("drm/amdgpu/display: split dp connector registration (v4)")
Signed-off-by Alex Deucher <[email protected]>
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 10 +++++++++- .../drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 8 ++++---- 2 files changed, 13 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +9 -1
@@ -4738,10 +4738,18 @@ amdgpu_dm_connector_atomic_duplicate_state(struct drm_connector *connector)static int amdgpu_dm_connector_late_register (struct drm_connector *connector) { -#if defined(CONFIG_DEBUG_FS )struct amdgpu_dm_connector *amdgpu_dm_connector =to_amdgpu_dm_connector (connector); +int r; +if (connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort) { + 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);#endif
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +4 -4
@@ -113,16 +113,16 @@ amdgpu_dm_mst_connector_late_register(struct drm_connector *connector)to_amdgpu_dm_connector (connector);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) + r =drm_dp_mst_connector_late_register (connector, + amdgpu_dm_connector->port); +if (r <0 )return r;#if defined(CONFIG_DEBUG_FS )connector_debugfs_init (amdgpu_dm_connector);#endif -return r; +return 0 ; } static void
Signature · 6 lines
2.25.2 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/2 drm/amdgpu/display: give aux i2c buses more meaningful names
Mirror what we do for i2c display buses.
Signed-off-by Alex Deucher <[email protected]>
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 ++- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 7 +++++-- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h | 3 ++- 3 files changed, 9 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +2 -1
@@ -4679,6 +4679,7 @@ static void amdgpu_dm_connector_destroy(struct drm_connector *connector)i2c_del_adapter (&aconnector->i2c->base);kfree (aconnector->i2c); } +kfree (aconnector->dm_dp_aux.aux.name);kfree (connector); }
@@ -6118,7 +6119,7 @@ static int amdgpu_dm_connector_init(struct amdgpu_display_manager *dm,if (connector_type == DRM_MODE_CONNECTOR_DisplayPort || connector_type == DRM_MODE_CONNECTOR_eDP) -amdgpu_dm_initialize_dp_connector (dm, aconnector); +amdgpu_dm_initialize_dp_connector (dm, aconnector, link->link_index); out_free:if (res) {
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +5 -2
@@ -429,9 +429,12 @@ static const struct drm_dp_mst_topology_cbs dm_mst_cbs = { };void amdgpu_dm_initialize_dp_connector (struct amdgpu_display_manager *dm, -struct amdgpu_dm_connector *aconnector) +struct amdgpu_dm_connector *aconnector, +int link_index) { - aconnector->dm_dp_aux.aux.name ="dmdc" ; + aconnector->dm_dp_aux.aux.name = +kasprintf (GFP_KERNEL ,"AMDGPU DM aux hw bus %d" , + link_index); aconnector->dm_dp_aux.aux.transfer = dm_dp_aux_transfer; aconnector->dm_dp_aux.ddc_service = aconnector->dc_link->ddc;
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h +2 -1
@@ -32,7 +32,8 @@ struct amdgpu_dm_connector;int dm_mst_get_pbn_divider (struct dc_link *link);void amdgpu_dm_initialize_dp_connector (struct amdgpu_display_manager *dm, -struct amdgpu_dm_connector *aconnector); +struct amdgpu_dm_connector *aconnector, +int link_index);#if defined(CONFIG_DRM_AMD_DC_DCN ) bool compute_mst_dsc_configs_for_state(struct drm_atomic_state *state,
Signature · 6 lines
2.25.2 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx