Skip to content

Commit 615eff3

Browse files
bpankajlLyude
authored andcommitted
drm: Remove dp mst register connector callbacks
drm_dp_mst_port_add_connector() directly calls the drm_connector_register() now and drm_dp_mst_topology_mgr_cbs.register_connector callback is not getting called anymore. Hence remove all drm_dp_mst_topology_mgr_cbs.register_connector callbacks. This is the preparatory step for removing the drm_dp_mst_topology_mgr_cbs.register_connector callback hook. The removal is done with below sementic patch: @r1@ identifier func, E; @@ struct drm_dp_mst_topology_cbs E = { ..., - .register_connector = func }; @delete depends on r1@ identifier r1.func; @@ - static void func(...){...} Signed-off-by: Pankaj Bharadiya <[email protected]> Suggested-by: Emil Velikov <[email protected]> Suggested-by: Lyude Paul <[email protected]> Signed-off-by: Lyude Paul <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] Reviewed-by: Lyude Paul <[email protected]>
1 parent f8d97d9 commit 615eff3

File tree

4 files changed

+0
-25
lines changed

4 files changed

+0
-25
lines changed

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -457,15 +457,9 @@ static void dm_dp_destroy_mst_connector(struct drm_dp_mst_topology_mgr *mgr,
457457
drm_connector_put(connector);
458458
}
459459

460-
static void dm_dp_mst_register_connector(struct drm_connector *connector)
461-
{
462-
drm_connector_register(connector);
463-
}
464-
465460
static const struct drm_dp_mst_topology_cbs dm_mst_cbs = {
466461
.add_connector = dm_dp_add_mst_connector,
467462
.destroy_connector = dm_dp_destroy_mst_connector,
468-
.register_connector = dm_dp_mst_register_connector
469463
};
470464

471465
void amdgpu_dm_initialize_dp_connector(struct amdgpu_display_manager *dm,

drivers/gpu/drm/i915/display/intel_dp_mst.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -719,11 +719,6 @@ static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolo
719719
return NULL;
720720
}
721721

722-
static void intel_dp_register_mst_connector(struct drm_connector *connector)
723-
{
724-
drm_connector_register(connector);
725-
}
726-
727722
static void intel_dp_destroy_mst_connector(struct drm_dp_mst_topology_mgr *mgr,
728723
struct drm_connector *connector)
729724
{
@@ -735,7 +730,6 @@ static void intel_dp_destroy_mst_connector(struct drm_dp_mst_topology_mgr *mgr,
735730

736731
static const struct drm_dp_mst_topology_cbs mst_cbs = {
737732
.add_connector = intel_dp_add_mst_connector,
738-
.register_connector = intel_dp_register_mst_connector,
739733
.destroy_connector = intel_dp_destroy_mst_connector,
740734
};
741735

drivers/gpu/drm/nouveau/dispnv50/disp.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1267,12 +1267,6 @@ nv50_mstm_destroy_connector(struct drm_dp_mst_topology_mgr *mgr,
12671267
drm_connector_put(&mstc->connector);
12681268
}
12691269

1270-
static void
1271-
nv50_mstm_register_connector(struct drm_connector *connector)
1272-
{
1273-
drm_connector_register(connector);
1274-
}
1275-
12761270
static struct drm_connector *
12771271
nv50_mstm_add_connector(struct drm_dp_mst_topology_mgr *mgr,
12781272
struct drm_dp_mst_port *port, const char *path)
@@ -1291,7 +1285,6 @@ nv50_mstm_add_connector(struct drm_dp_mst_topology_mgr *mgr,
12911285
static const struct drm_dp_mst_topology_cbs
12921286
nv50_mstm = {
12931287
.add_connector = nv50_mstm_add_connector,
1294-
.register_connector = nv50_mstm_register_connector,
12951288
.destroy_connector = nv50_mstm_destroy_connector,
12961289
};
12971290

drivers/gpu/drm/radeon/radeon_dp_mst.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -301,11 +301,6 @@ static struct drm_connector *radeon_dp_add_mst_connector(struct drm_dp_mst_topol
301301
return connector;
302302
}
303303

304-
static void radeon_dp_register_mst_connector(struct drm_connector *connector)
305-
{
306-
drm_connector_register(connector);
307-
}
308-
309304
static void radeon_dp_destroy_mst_connector(struct drm_dp_mst_topology_mgr *mgr,
310305
struct drm_connector *connector)
311306
{
@@ -318,7 +313,6 @@ static void radeon_dp_destroy_mst_connector(struct drm_dp_mst_topology_mgr *mgr,
318313

319314
static const struct drm_dp_mst_topology_cbs mst_cbs = {
320315
.add_connector = radeon_dp_add_mst_connector,
321-
.register_connector = radeon_dp_register_mst_connector,
322316
.destroy_connector = radeon_dp_destroy_mst_connector,
323317
};
324318

0 commit comments

Comments
 (0)