From: Hans Verkuil hans.verkuil@cisco.com
These are required for the CEC MST support.
Signed-off-by: Hans Verkuil hans.verkuil@cisco.com Signed-off-by: Sam McNally sammc@chromium.org ---
(no changes since v1)
drivers/gpu/drm/drm_dp_mst_topology.c | 6 ++---- include/drm/drm_dp_mst_helper.h | 4 ++++ 2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c index 0d753201adbd..c783a2a1c114 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c @@ -62,8 +62,6 @@ struct drm_dp_pending_up_req { static bool dump_dp_payload_table(struct drm_dp_mst_topology_mgr *mgr, char *buf);
-static void drm_dp_mst_topology_put_port(struct drm_dp_mst_port *port); - static int drm_dp_dpcd_write_payload(struct drm_dp_mst_topology_mgr *mgr, int id, struct drm_dp_payload *payload); @@ -1864,7 +1862,7 @@ static void drm_dp_mst_topology_get_port(struct drm_dp_mst_port *port) * drm_dp_mst_topology_try_get_port() * drm_dp_mst_topology_get_port() */ -static void drm_dp_mst_topology_put_port(struct drm_dp_mst_port *port) +void drm_dp_mst_topology_put_port(struct drm_dp_mst_port *port) { topology_ref_history_lock(port->mgr);
@@ -1935,7 +1933,7 @@ drm_dp_mst_topology_get_port_validated_locked(struct drm_dp_mst_branch *mstb, return NULL; }
-static struct drm_dp_mst_port * +struct drm_dp_mst_port * drm_dp_mst_topology_get_port_validated(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port) { diff --git a/include/drm/drm_dp_mst_helper.h b/include/drm/drm_dp_mst_helper.h index c7c79e0ced18..d036222e0d64 100644 --- a/include/drm/drm_dp_mst_helper.h +++ b/include/drm/drm_dp_mst_helper.h @@ -754,6 +754,10 @@ drm_dp_mst_detect_port(struct drm_connector *connector, struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port);
+struct drm_dp_mst_port *drm_dp_mst_topology_get_port_validated +(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port); +void drm_dp_mst_topology_put_port(struct drm_dp_mst_port *port); + struct edid *drm_dp_mst_get_edid(struct drm_connector *connector, struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port);