Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6

[linux-2.6-microblaze.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 eb603f1..e23df5f 100644 (file)
--- a/drivers/gpu/drm/drm_dp_mst_topology.c
+++ b/drivers/gpu/drm/drm_dp_mst_topology.c
@@ -2632,6 +2632,16 @@ void drm_dp_mst_dump_topology(struct seq_file *m,
                        seq_printf(m, "%02x ", buf[i]);
                seq_printf(m, "\n");
 
+               /* dump the standard OUI branch header */
+               ret = drm_dp_dpcd_read(mgr->aux, DP_BRANCH_OUI, buf, DP_BRANCH_OUI_HEADER_SIZE);
+               seq_printf(m, "branch oui: ");
+               for (i = 0; i < 0x3; i++)
+                       seq_printf(m, "%02x", buf[i]);
+               seq_printf(m, " devid: ");
+               for (i = 0x3; i < 0x8; i++)
+                       seq_printf(m, "%c", buf[i]);
+               seq_printf(m, " revision: hw: %x.%x sw: %x.%x", buf[0x9] >> 4, buf[0x9] & 0xf, buf[0xa], buf[0xb]);
+               seq_printf(m, "\n");
                bret = dump_dp_payload_table(mgr, buf);
                if (bret == true) {
                        seq_printf(m, "payload table: ");