OSDN Git Service

drm: Add drm_dp_destroy_connector helper and use it
authorPankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Sat, 7 Mar 2020 08:30:22 +0000 (14:00 +0530)
committerLyude Paul <lyude@redhat.com>
Wed, 11 Mar 2020 20:53:17 +0000 (16:53 -0400)
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 which I
an not sure if it should stay or not.

Create and use a helper which calls driver's destroy_connector hook if
available otherwise does cleanup internally.

This is the step towards removing identical hooks from every driver.

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-5-pankaj.laxminarayan.bharadiya@intel.com
Reviewed-by: Lyude Paul <lyude@redhat.com>
drivers/gpu/drm/drm_dp_mst_topology.c

index 0234baa..4fbec48 100644 (file)
@@ -4673,11 +4673,23 @@ static void drm_dp_tx_work(struct work_struct *work)
        mutex_unlock(&mgr->qlock);
 }
 
+static inline void drm_dp_destroy_connector(struct drm_dp_mst_port *port)
+{
+       if (!port->connector)
+               return;
+
+       if (port->mgr->cbs->destroy_connector) {
+               port->mgr->cbs->destroy_connector(port->mgr, port->connector);
+       } else {
+               drm_connector_unregister(port->connector);
+               drm_connector_put(port->connector);
+       }
+}
+
 static inline void
 drm_dp_delayed_destroy_port(struct drm_dp_mst_port *port)
 {
-       if (port->connector)
-               port->mgr->cbs->destroy_connector(port->mgr, port->connector);
+       drm_dp_destroy_connector(port);
 
        drm_dp_port_set_pdt(port, DP_PEER_DEVICE_NONE, port->mcs);
        drm_dp_mst_put_port_malloc(port);