From: Mika Kahola <mika.kahola@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: daniel.vetter@ffwll.ch, dri-devel@lists.freedesktop.org
Subject: [PATCH v8 11/12] drm: Add DP branch device info on debugfs
Date: Wed, 17 Aug 2016 13:49:48 +0300 [thread overview]
Message-ID: <1471430989-28161-13-git-send-email-mika.kahola@intel.com> (raw)
In-Reply-To: <1471430989-28161-1-git-send-email-mika.kahola@intel.com>
Read DisplayPort branch device info from through debugfs
interface.
v2: use drm_dp_helper routines to collect data
v3: cleanup to match the drm_dp_helper.c patches introduced
earlier in this series
v4: move DP branch device info to function 'intel_dp_branch_device_info()'
v5: initial step to move debugging info from intel_dp. to drm_dp_helper.c (Daniel)
v6: read hw and sw revision without using specific drm_dp_helper routines
Signed-off-by: Mika Kahola <mika.kahola@intel.com>
---
drivers/gpu/drm/drm_dp_helper.c | 81 +++++++++++++++++++++++++++++++++++++
drivers/gpu/drm/i915/i915_debugfs.c | 3 ++
include/drm/drm_dp_helper.h | 2 +
3 files changed, 86 insertions(+)
diff --git a/drivers/gpu/drm/drm_dp_helper.c b/drivers/gpu/drm/drm_dp_helper.c
index 01ee7af..23cd6dc 100644
--- a/drivers/gpu/drm/drm_dp_helper.c
+++ b/drivers/gpu/drm/drm_dp_helper.c
@@ -526,6 +526,87 @@ int drm_dp_downstream_id(struct drm_dp_aux *aux, char id[6])
}
EXPORT_SYMBOL(drm_dp_downstream_id);
+/**
+ * drm_dp_downstream_debug() - debug DP branch devices
+ * @m: pointer for debugfs file
+ * @dpcd: DisplayPort configuration data
+ * @port_cap: port capabilities
+ * @aux: DisplayPort AUX channel
+ *
+ */
+void drm_dp_downstream_debug(struct seq_file *m, const u8 dpcd[DP_RECEIVER_CAP_SIZE],
+ const u8 port_cap[4], struct drm_dp_aux *aux)
+{
+ bool detailed_cap_info = dpcd[DP_DOWNSTREAMPORT_PRESENT] &
+ DP_DETAILED_CAP_INFO_AVAILABLE;
+ int clk;
+ int bpc;
+ char id[6];
+ int len;
+ uint8_t rev[2];
+ int type = port_cap[0] & DP_DS_PORT_TYPE_MASK;
+ bool branch_device = dpcd[DP_DOWNSTREAMPORT_PRESENT] & DP_DWN_STRM_PORT_PRESENT;
+
+ seq_printf(m, "\tDP branch device present: %s\n", branch_device ? "yes" : "no");
+
+ if (!branch_device)
+ return;
+
+ switch (type) {
+ case DP_DS_PORT_TYPE_DP:
+ seq_printf(m, "\t\tType: DisplayPort\n");
+ break;
+ case DP_DS_PORT_TYPE_VGA:
+ seq_printf(m, "\t\tType: VGA\n");
+ break;
+ case DP_DS_PORT_TYPE_DVI:
+ seq_printf(m, "\t\tType: DVI\n");
+ break;
+ case DP_DS_PORT_TYPE_HDMI:
+ seq_printf(m, "\t\tType: HDMI\n");
+ break;
+ case DP_DS_PORT_TYPE_NON_EDID:
+ seq_printf(m, "\t\tType: others without EDID support\n");
+ break;
+ case DP_DS_PORT_TYPE_DP_DUALMODE:
+ seq_printf(m, "\t\tType: DP++\n");
+ break;
+ case DP_DS_PORT_TYPE_WIRELESS:
+ seq_printf(m, "\t\tType: Wireless\n");
+ break;
+ default:
+ seq_printf(m, "\t\tType: N/A\n");
+ }
+
+ drm_dp_downstream_id(aux, id);
+ seq_printf(m, "\t\tID: %s\n", id);
+
+ len = drm_dp_dpcd_read(aux, DP_BRANCH_HW_REV, &rev[0], 1);
+ if (len > 0)
+ seq_printf(m, "\t\tHW: %d.%d\n", (rev[0] & 0xf0) >> 4, rev[0] & 0xf);
+
+ len = drm_dp_dpcd_read(aux, DP_BRANCH_SW_REV, &rev, 2);
+ if (len > 0)
+ seq_printf(m, "\t\tSW: %d.%d\n", rev[0], rev[1]);
+
+ if (detailed_cap_info) {
+ clk = drm_dp_downstream_max_clock(dpcd, port_cap);
+
+ if (clk > 0) {
+ if (type == DP_DS_PORT_TYPE_VGA)
+ seq_printf(m, "\t\tMax dot clock: %d kHz\n", clk);
+ else
+ seq_printf(m, "\t\tMax TMDS clock: %d kHz\n", clk);
+ }
+
+ bpc = drm_dp_downstream_max_bpc(dpcd, port_cap);
+
+ if (bpc > 0)
+ seq_printf(m, "\t\tMax bpc: %d\n", bpc);
+ }
+}
+EXPORT_SYMBOL(drm_dp_downstream_debug);
+
/*
* I2C-over-AUX implementation
*/
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 01ae5ee..90c736f 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -2923,6 +2923,9 @@ static void intel_dp_info(struct seq_file *m,
seq_printf(m, "\taudio support: %s\n", yesno(intel_dp->has_audio));
if (intel_connector->base.connector_type == DRM_MODE_CONNECTOR_eDP)
intel_panel_info(m, &intel_connector->panel);
+
+ drm_dp_downstream_debug(m, intel_dp->dpcd, intel_dp->downstream_ports,
+ &intel_dp->aux);
}
static void intel_hdmi_info(struct seq_file *m,
diff --git a/include/drm/drm_dp_helper.h b/include/drm/drm_dp_helper.h
index 215202f..2a79882 100644
--- a/include/drm/drm_dp_helper.h
+++ b/include/drm/drm_dp_helper.h
@@ -823,6 +823,8 @@ int drm_dp_downstream_max_clock(const u8 dpcd[DP_RECEIVER_CAP_SIZE],
int drm_dp_downstream_max_bpc(const u8 dpcd[DP_RECEIVER_CAP_SIZE],
const u8 port_cap[4]);
int drm_dp_downstream_id(struct drm_dp_aux *aux, char id[6]);
+void drm_dp_downstream_debug(struct seq_file *m, const u8 dpcd[DP_RECEIVER_CAP_SIZE],
+ const u8 port_cap[4], struct drm_dp_aux *aux);
void drm_dp_aux_init(struct drm_dp_aux *aux);
int drm_dp_aux_register(struct drm_dp_aux *aux);
--
1.9.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2016-08-17 10:49 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-17 10:49 [PATCH v8 00/12] drm/i915: DP branch devices Mika Kahola
2016-08-17 10:49 ` [PATCH v8 01/12] drm: Add missing DP downstream port types Mika Kahola
2016-08-17 10:49 ` [PATCH v8 02/12] drm: Drop VGA from bpc definitions Mika Kahola
2016-08-17 10:49 ` [PATCH v8 03/12] drm: Helper to read max clock rate Mika Kahola
2016-09-08 13:01 ` Ville Syrjälä
2016-09-08 13:18 ` Kahola, Mika
2016-08-17 10:49 ` [PATCH v8 04/12] drm: Helper to read max bits per component Mika Kahola
2016-09-08 13:03 ` Ville Syrjälä
2016-08-17 10:49 ` [PATCH v8 05/12] drm: Read DP branch device id Mika Kahola
2016-08-17 10:49 ` [PATCH v8 06/12] drm/i915: Cleanup DisplayPort AUX channel initialization Mika Kahola
2016-09-07 21:13 ` Jim Bride
2016-08-17 10:49 ` [PATCH v8 07/12] drm/i915: Read DP branch device HW revision Mika Kahola
2016-09-07 21:16 ` Jim Bride
2016-08-17 10:49 ` [PATCH v8 08/12] drm/i915: Read DP branch device SW revision Mika Kahola
2016-09-07 21:20 ` Jim Bride
2016-09-08 11:51 ` Kahola, Mika
2016-08-17 10:49 ` [PATCH v8 09/12] Check pixel rate for DP to VGA dongle Mika Kahola
2016-09-07 21:23 ` Jim Bride
2016-08-17 10:49 ` [PATCH v8 09/12] drm/i915: " Mika Kahola
2016-08-17 10:49 ` [PATCH v8 10/12] drm/i915: Update bits per component for display info Mika Kahola
2016-09-07 21:27 ` Jim Bride
2016-09-08 12:30 ` Kahola, Mika
2016-08-17 10:49 ` Mika Kahola [this message]
2016-09-07 21:30 ` [PATCH v8 11/12] drm: Add DP branch device info on debugfs Jim Bride
2016-08-17 10:49 ` [PATCH v8 12/12] drm/i915: Check TMDS clock DP to HDMI dongle Mika Kahola
2016-09-07 21:31 ` Jim Bride
2016-09-08 12:48 ` Ville Syrjälä
2016-09-09 7:45 ` Mika Kahola
2016-09-09 9:09 ` Ville Syrjälä
2016-09-09 13:23 ` Mika Kahola
-- strict thread matches above, loose matches on Subject: below --
2016-08-17 10:16 [PATCH v8 00/12] drm/i915: DP branch devices Mika Kahola
2016-08-17 10:16 ` [PATCH v8 11/12] drm: Add DP branch device info on debugfs Mika Kahola
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1471430989-28161-13-git-send-email-mika.kahola@intel.com \
--to=mika.kahola@intel.com \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).