aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/drm_dp_mst_topology.c
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2018-11-28 17:12:34 -0500
committerDaniel Vetter <daniel.vetter@ffwll.ch>2018-12-10 05:01:15 -0500
commit16bff572cc660f19e58c99941368dea050b36a05 (patch)
treea1433a0fc910122195617fdfdfce3beaf543951f /drivers/gpu/drm/drm_dp_mst_topology.c
parent7cd3cf3540a37072c647b8b5120a80de5bb3d199 (diff)
drm/dp-mst-helper: Remove hotplug callback
When everyone implements it exactly the same way, among all 4 implementations, there's not really a need to overwrite this at all. Aside: drm_kms_helper_hotplug_event is pretty much core functionality at this point. Probably should move it there. Reviewed-by: Lyude Paul <lyude@redhat.com> Acked-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20181128221234.15054-1-daniel.vetter@ffwll.ch
Diffstat (limited to 'drivers/gpu/drm/drm_dp_mst_topology.c')
-rw-r--r--drivers/gpu/drm/drm_dp_mst_topology.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c
index 529414556962..a9b684f14d14 100644
--- a/drivers/gpu/drm/drm_dp_mst_topology.c
+++ b/drivers/gpu/drm/drm_dp_mst_topology.c
@@ -33,6 +33,7 @@
33#include <drm/drm_fixed.h> 33#include <drm/drm_fixed.h>
34#include <drm/drm_atomic.h> 34#include <drm/drm_atomic.h>
35#include <drm/drm_atomic_helper.h> 35#include <drm/drm_atomic_helper.h>
36#include <drm/drm_crtc_helper.h>
36 37
37/** 38/**
38 * DOC: dp mst helper 39 * DOC: dp mst helper
@@ -1639,7 +1640,7 @@ static void drm_dp_send_link_address(struct drm_dp_mst_topology_mgr *mgr,
1639 for (i = 0; i < txmsg->reply.u.link_addr.nports; i++) { 1640 for (i = 0; i < txmsg->reply.u.link_addr.nports; i++) {
1640 drm_dp_add_port(mstb, mgr->dev, &txmsg->reply.u.link_addr.ports[i]); 1641 drm_dp_add_port(mstb, mgr->dev, &txmsg->reply.u.link_addr.ports[i]);
1641 } 1642 }
1642 (*mgr->cbs->hotplug)(mgr); 1643 drm_kms_helper_hotplug_event(mgr->dev);
1643 } 1644 }
1644 } else { 1645 } else {
1645 mstb->link_address_sent = false; 1646 mstb->link_address_sent = false;
@@ -2412,7 +2413,7 @@ static int drm_dp_mst_handle_up_req(struct drm_dp_mst_topology_mgr *mgr)
2412 drm_dp_update_port(mstb, &msg.u.conn_stat); 2413 drm_dp_update_port(mstb, &msg.u.conn_stat);
2413 2414
2414 DRM_DEBUG_KMS("Got CSN: pn: %d ldps:%d ddps: %d mcs: %d ip: %d pdt: %d\n", msg.u.conn_stat.port_number, msg.u.conn_stat.legacy_device_plug_status, msg.u.conn_stat.displayport_device_plug_status, msg.u.conn_stat.message_capability_status, msg.u.conn_stat.input_port, msg.u.conn_stat.peer_device_type); 2415 DRM_DEBUG_KMS("Got CSN: pn: %d ldps:%d ddps: %d mcs: %d ip: %d pdt: %d\n", msg.u.conn_stat.port_number, msg.u.conn_stat.legacy_device_plug_status, msg.u.conn_stat.displayport_device_plug_status, msg.u.conn_stat.message_capability_status, msg.u.conn_stat.input_port, msg.u.conn_stat.peer_device_type);
2415 (*mgr->cbs->hotplug)(mgr); 2416 drm_kms_helper_hotplug_event(mgr->dev);
2416 2417
2417 } else if (msg.req_type == DP_RESOURCE_STATUS_NOTIFY) { 2418 } else if (msg.req_type == DP_RESOURCE_STATUS_NOTIFY) {
2418 drm_dp_send_up_ack_reply(mgr, mgr->mst_primary, msg.req_type, seqno, false); 2419 drm_dp_send_up_ack_reply(mgr, mgr->mst_primary, msg.req_type, seqno, false);
@@ -3109,7 +3110,7 @@ static void drm_dp_destroy_connector_work(struct work_struct *work)
3109 send_hotplug = true; 3110 send_hotplug = true;
3110 } 3111 }
3111 if (send_hotplug) 3112 if (send_hotplug)
3112 (*mgr->cbs->hotplug)(mgr); 3113 drm_kms_helper_hotplug_event(mgr->dev);
3113} 3114}
3114 3115
3115static struct drm_private_state * 3116static struct drm_private_state *