mirror of https://gitee.com/openkylin/linux.git
drm: Remove drm dp mst destroy_connector callbacks
drm_dp_mst_topology_mgr_cbs.destroy_connector callbacks are identical amongst every driver and don't do anything other than cleaning up the connector((drm_connector_unregister()/drm_connector_put())) except for amdgpu_dm driver where some amdgpu_dm specific code in there. This connector cleaning up is now being handled in the drm core so driver destroy_connector callbacks are not needed (except for amdgpu_dm) hence remove them. Removal is done with below sementic patch: @r1@ identifier func, E; @@ struct drm_dp_mst_topology_cbs E = { ..., - .destroy_connector = func }; @delete depends on r1@ identifier r1.func; @@ - static void func(...){...} Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com> Suggested-by: Emil Velikov <emil.velikov@collabora.com> Suggested-by: Lyude Paul <lyude@redhat.com> Signed-off-by: Lyude Paul <lyude@redhat.com> Link: https://patchwork.freedesktop.org/patch/msgid/20200307083023.76498-6-pankaj.laxminarayan.bharadiya@intel.com Reviewed-by: Lyude Paul <lyude@redhat.com>
This commit is contained in:
parent
e1ae63b33b
commit
cce81ba6b7
|
@ -719,18 +719,8 @@ static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolo
|
|||
return NULL;
|
||||
}
|
||||
|
||||
static void intel_dp_destroy_mst_connector(struct drm_dp_mst_topology_mgr *mgr,
|
||||
struct drm_connector *connector)
|
||||
{
|
||||
DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n", connector->base.id, connector->name);
|
||||
drm_connector_unregister(connector);
|
||||
|
||||
drm_connector_put(connector);
|
||||
}
|
||||
|
||||
static const struct drm_dp_mst_topology_cbs mst_cbs = {
|
||||
.add_connector = intel_dp_add_mst_connector,
|
||||
.destroy_connector = intel_dp_destroy_mst_connector,
|
||||
};
|
||||
|
||||
static struct intel_dp_mst_encoder *
|
||||
|
|
|
@ -1256,17 +1256,6 @@ nv50_mstm_prepare(struct nv50_mstm *mstm)
|
|||
}
|
||||
}
|
||||
|
||||
static void
|
||||
nv50_mstm_destroy_connector(struct drm_dp_mst_topology_mgr *mgr,
|
||||
struct drm_connector *connector)
|
||||
{
|
||||
struct nv50_mstc *mstc = nv50_mstc(connector);
|
||||
|
||||
drm_connector_unregister(&mstc->connector);
|
||||
|
||||
drm_connector_put(&mstc->connector);
|
||||
}
|
||||
|
||||
static struct drm_connector *
|
||||
nv50_mstm_add_connector(struct drm_dp_mst_topology_mgr *mgr,
|
||||
struct drm_dp_mst_port *port, const char *path)
|
||||
|
@ -1285,7 +1274,6 @@ nv50_mstm_add_connector(struct drm_dp_mst_topology_mgr *mgr,
|
|||
static const struct drm_dp_mst_topology_cbs
|
||||
nv50_mstm = {
|
||||
.add_connector = nv50_mstm_add_connector,
|
||||
.destroy_connector = nv50_mstm_destroy_connector,
|
||||
};
|
||||
|
||||
void
|
||||
|
|
|
@ -301,19 +301,8 @@ static struct drm_connector *radeon_dp_add_mst_connector(struct drm_dp_mst_topol
|
|||
return connector;
|
||||
}
|
||||
|
||||
static void radeon_dp_destroy_mst_connector(struct drm_dp_mst_topology_mgr *mgr,
|
||||
struct drm_connector *connector)
|
||||
{
|
||||
drm_connector_unregister(connector);
|
||||
drm_connector_cleanup(connector);
|
||||
|
||||
kfree(connector);
|
||||
DRM_DEBUG_KMS("\n");
|
||||
}
|
||||
|
||||
static const struct drm_dp_mst_topology_cbs mst_cbs = {
|
||||
.add_connector = radeon_dp_add_mst_connector,
|
||||
.destroy_connector = radeon_dp_destroy_mst_connector,
|
||||
};
|
||||
|
||||
static struct
|
||||
|
|
Loading…
Reference in New Issue