aboutsummaryrefslogtreecommitdiffstats
path: root/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2680-drm-dp-mst-helper-Remove-hotplug-callback.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2680-drm-dp-mst-helper-Remove-hotplug-callback.patch')
-rw-r--r--meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2680-drm-dp-mst-helper-Remove-hotplug-callback.patch61
1 files changed, 61 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2680-drm-dp-mst-helper-Remove-hotplug-callback.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2680-drm-dp-mst-helper-Remove-hotplug-callback.patch
new file mode 100644
index 00000000..78eef479
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2680-drm-dp-mst-helper-Remove-hotplug-callback.patch
@@ -0,0 +1,61 @@
+From 56232b7d8016aa442b65d90d350532217be83878 Mon Sep 17 00:00:00 2001
+From: Daniel Vetter <daniel.vetter@ffwll.ch>
+Date: Wed, 28 Nov 2018 23:12:34 +0100
+Subject: [PATCH 2680/2940] 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
+---
+ drivers/gpu/drm/drm_dp_mst_topology.c | 7 ++++---
+ 1 file 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 d708472d93c4..c0c7d006568e 100644
+--- a/drivers/gpu/drm/drm_dp_mst_topology.c
++++ b/drivers/gpu/drm/drm_dp_mst_topology.c
+@@ -33,6 +33,7 @@
+ #include <drm/drm_fixed.h>
+ #include <drm/drm_atomic.h>
+ #include <drm/drm_atomic_helper.h>
++#include <drm/drm_crtc_helper.h>
+
+ /**
+ * DOC: dp mst helper
+@@ -1638,7 +1639,7 @@ static void drm_dp_send_link_address(struct drm_dp_mst_topology_mgr *mgr,
+ for (i = 0; i < txmsg->reply.u.link_addr.nports; i++) {
+ drm_dp_add_port(mstb, mgr->dev, &txmsg->reply.u.link_addr.ports[i]);
+ }
+- (*mgr->cbs->hotplug)(mgr);
++ drm_kms_helper_hotplug_event(mgr->dev);
+ }
+ } else {
+ mstb->link_address_sent = false;
+@@ -2411,7 +2412,7 @@ static int drm_dp_mst_handle_up_req(struct drm_dp_mst_topology_mgr *mgr)
+ drm_dp_update_port(mstb, &msg.u.conn_stat);
+
+ 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);
+- (*mgr->cbs->hotplug)(mgr);
++ drm_kms_helper_hotplug_event(mgr->dev);
+
+ } else if (msg.req_type == DP_RESOURCE_STATUS_NOTIFY) {
+ drm_dp_send_up_ack_reply(mgr, mgr->mst_primary, msg.req_type, seqno, false);
+@@ -3101,7 +3102,7 @@ static void drm_dp_destroy_connector_work(struct work_struct *work)
+ send_hotplug = true;
+ }
+ if (send_hotplug)
+- (*mgr->cbs->hotplug)(mgr);
++ drm_kms_helper_hotplug_event(mgr->dev);
+ }
+
+ static struct drm_private_state *
+--
+2.17.1
+