drm/nouveau/ltc/gm107: use nvkm_mask to set cbc_ctrl1

[linux-2.6-block.git] / drivers / gpu / drm / drm_dp_mst_topology.c

diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c
index 809959d56d7826364b540204a16190aaf270f9c4..c5a942b15d637ee1cb206bb232620188cc0697a0 100644 (file)
--- a/drivers/gpu/drm/drm_dp_mst_topology.c
+++ b/drivers/gpu/drm/drm_dp_mst_topology.c
@@ -666,7 +666,9 @@ static int build_enum_path_resources(struct drm_dp_sideband_msg_tx *msg, int por
 }
 
 static int build_allocate_payload(struct drm_dp_sideband_msg_tx *msg, int port_num,
-                                 u8 vcpi, uint16_t pbn)
+                                 u8 vcpi, uint16_t pbn,
+                                 u8 number_sdp_streams,
+                                 u8 *sdp_stream_sink)
 {
        struct drm_dp_sideband_msg_req_body req;
        memset(&req, 0, sizeof(req));
@@ -674,6 +676,9 @@ static int build_allocate_payload(struct drm_dp_sideband_msg_tx *msg, int port_n
        req.u.allocate_payload.port_number = port_num;
        req.u.allocate_payload.vcpi = vcpi;
        req.u.allocate_payload.pbn = pbn;
+       req.u.allocate_payload.number_sdp_streams = number_sdp_streams;
+       memcpy(req.u.allocate_payload.sdp_stream_sink, sdp_stream_sink,
+                  number_sdp_streams);
        drm_dp_encode_sideband_req(&req, msg);
        msg->path_msg = true;
        return 0;
@@ -1562,6 +1567,8 @@ static int drm_dp_payload_send_msg(struct drm_dp_mst_topology_mgr *mgr,
        struct drm_dp_sideband_msg_tx *txmsg;
        struct drm_dp_mst_branch *mstb;
        int len, ret;
+       u8 sinks[DRM_DP_MAX_SDP_STREAMS];
+       int i;
 
        mstb = drm_dp_get_validated_mstb_ref(mgr, port->parent);
        if (!mstb)
@@ -1573,10 +1580,13 @@ static int drm_dp_payload_send_msg(struct drm_dp_mst_topology_mgr *mgr,
                goto fail_put;
        }
 
+       for (i = 0; i < port->num_sdp_streams; i++)
+               sinks[i] = i;
+
        txmsg->dst = mstb;
        len = build_allocate_payload(txmsg, port->port_num,
                                     id,
-                                    pbn);
+                                    pbn, port->num_sdp_streams, sinks);
 
        drm_dp_queue_down_tx(mgr, txmsg);
 
@@ -1673,6 +1683,7 @@ int drm_dp_update_payload_part1(struct drm_dp_mst_topology_mgr *mgr)
                if (mgr->proposed_vcpis[i]) {
                        port = container_of(mgr->proposed_vcpis[i], struct drm_dp_mst_port, vcpi);
                        req_payload.num_slots = mgr->proposed_vcpis[i]->num_slots;
+                       req_payload.vcpi = mgr->proposed_vcpis[i]->vcpi;
                } else {
                        port = NULL;
                        req_payload.num_slots = 0;
@@ -1688,6 +1699,7 @@ int drm_dp_update_payload_part1(struct drm_dp_mst_topology_mgr *mgr)
                        if (req_payload.num_slots) {
                                drm_dp_create_payload_step1(mgr, mgr->proposed_vcpis[i]->vcpi, &req_payload);
                                mgr->payloads[i].num_slots = req_payload.num_slots;
+                               mgr->payloads[i].vcpi = req_payload.vcpi;
                        } else if (mgr->payloads[i].num_slots) {
                                mgr->payloads[i].num_slots = 0;
                                drm_dp_destroy_payload_step1(mgr, port, port->vcpi.vcpi, &mgr->payloads[i]);
@@ -1823,7 +1835,7 @@ static int drm_dp_encode_up_ack_reply(struct drm_dp_sideband_msg_tx *msg, u8 req
 {
        struct drm_dp_sideband_msg_reply_body reply;
 
-       reply.reply_type = 1;
+       reply.reply_type = 0;
        reply.req_type = req_type;
        drm_dp_encode_sideband_reply(&reply, msg);
        return 0;
@@ -2258,6 +2270,27 @@ out:
 }
 EXPORT_SYMBOL(drm_dp_mst_detect_port);
 
+/**
+ * drm_dp_mst_port_has_audio() - Check whether port has audio capability or not
+ * @mgr: manager for this port
+ * @port: unverified pointer to a port.
+ *
+ * This returns whether the port supports audio or not.
+ */
+bool drm_dp_mst_port_has_audio(struct drm_dp_mst_topology_mgr *mgr,
+                                       struct drm_dp_mst_port *port)
+{
+       bool ret = false;
+
+       port = drm_dp_get_validated_port_ref(mgr, port);
+       if (!port)
+               return ret;
+       ret = port->has_audio;
+       drm_dp_put_port(port);
+       return ret;
+}
+EXPORT_SYMBOL(drm_dp_mst_port_has_audio);
+
 /**
  * drm_dp_mst_get_edid() - get EDID for an MST port
  * @connector: toplevel connector to get EDID for
@@ -2283,6 +2316,7 @@ struct edid *drm_dp_mst_get_edid(struct drm_connector *connector, struct drm_dp_
                edid = drm_get_edid(connector, &port->aux.ddc);
                drm_mode_connector_set_tile_property(connector);
        }
+       port->has_audio = drm_detect_monitor_audio(edid);
        drm_dp_put_port(port);
        return edid;
 }
@@ -2566,7 +2600,7 @@ static void drm_dp_mst_dump_mstb(struct seq_file *m,
 
        seq_printf(m, "%smst: %p, %d\n", prefix, mstb, mstb->num_ports);
        list_for_each_entry(port, &mstb->ports, next) {
-               seq_printf(m, "%sport: %d: ddps: %d ldps: %d, %p, conn: %p\n", prefix, port->port_num, port->ddps, port->ldps, port, port->connector);
+               seq_printf(m, "%sport: %d: ddps: %d ldps: %d, sdp: %d/%d, %p, conn: %p\n", prefix, port->port_num, port->ddps, port->ldps, port->num_sdp_streams, port->num_sdp_stream_sinks, port, port->connector);
                if (port->mstb)
                        drm_dp_mst_dump_mstb(m, port->mstb);
        }