Skip to content

Commit 7daec99

Browse files
committed
drm/amdgpu/display: give aux i2c buses more meaningful names
Mirror what we do for i2c display buses. Reviewed-by: Harry Wentland <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent 00a8037 commit 7daec99

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4664,6 +4664,7 @@ static void amdgpu_dm_connector_destroy(struct drm_connector *connector)
46644664
i2c_del_adapter(&aconnector->i2c->base);
46654665
kfree(aconnector->i2c);
46664666
}
4667+
kfree(aconnector->dm_dp_aux.aux.name);
46674668

46684669
kfree(connector);
46694670
}
@@ -6101,7 +6102,7 @@ static int amdgpu_dm_connector_init(struct amdgpu_display_manager *dm,
61016102

61026103
if (connector_type == DRM_MODE_CONNECTOR_DisplayPort
61036104
|| connector_type == DRM_MODE_CONNECTOR_eDP)
6104-
amdgpu_dm_initialize_dp_connector(dm, aconnector);
6105+
amdgpu_dm_initialize_dp_connector(dm, aconnector, link->link_index);
61056106

61066107
out_free:
61076108
if (res) {

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -472,9 +472,12 @@ static const struct drm_dp_mst_topology_cbs dm_mst_cbs = {
472472
};
473473

474474
void amdgpu_dm_initialize_dp_connector(struct amdgpu_display_manager *dm,
475-
struct amdgpu_dm_connector *aconnector)
475+
struct amdgpu_dm_connector *aconnector,
476+
int link_index)
476477
{
477-
aconnector->dm_dp_aux.aux.name = "dmdc";
478+
aconnector->dm_dp_aux.aux.name =
479+
kasprintf(GFP_KERNEL, "AMDGPU DM aux hw bus %d",
480+
link_index);
478481
aconnector->dm_dp_aux.aux.transfer = dm_dp_aux_transfer;
479482
aconnector->dm_dp_aux.ddc_service = aconnector->dc_link->ddc;
480483

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ struct amdgpu_dm_connector;
3232
int dm_mst_get_pbn_divider(struct dc_link *link);
3333

3434
void amdgpu_dm_initialize_dp_connector(struct amdgpu_display_manager *dm,
35-
struct amdgpu_dm_connector *aconnector);
35+
struct amdgpu_dm_connector *aconnector,
36+
int link_index);
3637

3738
#if defined(CONFIG_DRM_AMD_DC_DCN)
3839
bool compute_mst_dsc_configs_for_state(struct drm_atomic_state *state,

0 commit comments

Comments
 (0)