From: Sean Paul <sean@poorly.run>
To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org
Cc: rodrigo.vivi@intel.com, Sean Paul <seanpaul@chromium.org>,
Juston Li <juston.li@intel.com>,
daniel.vetter@ffwll.ch
Subject: [PATCH v4 13.5/14] drm/i915: Print HDCP version info for all connectors
Date: Thu, 27 Feb 2020 13:56:58 -0500 [thread overview]
Message-ID: <20200227185714.171466-1-sean@poorly.run> (raw)
In-Reply-To: <5bfd0d1e266b00029ee98e505fe4d3318a4787ea.camel@intel.com>
From: Sean Paul <seanpaul@chromium.org>
De-duplicate the HDCP version code and print it for all connectors.
Cc: Juston Li <juston.li@intel.com>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Changes in v4:
- Added to the set
---
.../drm/i915/display/intel_display_debugfs.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
index 46954cc7b6c01..eb948a14cfd61 100644
--- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
+++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
@@ -597,6 +597,11 @@ static void intel_hdcp_info(struct seq_file *m,
{
bool hdcp_cap, hdcp2_cap;
+ if (!intel_connector->hdcp.shim) {
+ seq_puts(m, "No Connector Support");
+ goto out;
+ }
+
hdcp_cap = intel_hdcp_capable(intel_connector);
hdcp2_cap = intel_hdcp2_capable(intel_connector);
@@ -608,6 +613,7 @@ static void intel_hdcp_info(struct seq_file *m,
if (!hdcp_cap && !hdcp2_cap)
seq_puts(m, "None");
+out:
seq_puts(m, "\n");
}
@@ -624,10 +630,6 @@ static void intel_dp_info(struct seq_file *m,
drm_dp_downstream_debug(m, intel_dp->dpcd, intel_dp->downstream_ports,
&intel_dp->aux);
- if (intel_connector->hdcp.shim) {
- seq_puts(m, "\tHDCP version: ");
- intel_hdcp_info(m, intel_connector);
- }
}
static void intel_dp_mst_info(struct seq_file *m,
@@ -651,10 +653,6 @@ static void intel_hdmi_info(struct seq_file *m,
struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(intel_encoder);
seq_printf(m, "\taudio support: %s\n", yesno(intel_hdmi->has_audio));
- if (intel_connector->hdcp.shim) {
- seq_puts(m, "\tHDCP version: ");
- intel_hdcp_info(m, intel_connector);
- }
}
static void intel_lvds_info(struct seq_file *m,
@@ -710,6 +708,9 @@ static void intel_connector_info(struct seq_file *m,
break;
}
+ seq_puts(m, "\tHDCP version: ");
+ intel_hdcp_info(m, intel_connector);
+
seq_printf(m, "\tmodes:\n");
list_for_each_entry(mode, &connector->modes, head)
intel_seq_print_mode(m, 2, mode);
--
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
WARNING: multiple messages have this Message-ID (diff)
From: Sean Paul <sean@poorly.run>
To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org
Cc: Sean Paul <seanpaul@chromium.org>, daniel.vetter@ffwll.ch
Subject: [Intel-gfx] [PATCH v4 13.5/14] drm/i915: Print HDCP version info for all connectors
Date: Thu, 27 Feb 2020 13:56:58 -0500 [thread overview]
Message-ID: <20200227185714.171466-1-sean@poorly.run> (raw)
In-Reply-To: <5bfd0d1e266b00029ee98e505fe4d3318a4787ea.camel@intel.com>
From: Sean Paul <seanpaul@chromium.org>
De-duplicate the HDCP version code and print it for all connectors.
Cc: Juston Li <juston.li@intel.com>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Changes in v4:
- Added to the set
---
.../drm/i915/display/intel_display_debugfs.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
index 46954cc7b6c01..eb948a14cfd61 100644
--- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
+++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
@@ -597,6 +597,11 @@ static void intel_hdcp_info(struct seq_file *m,
{
bool hdcp_cap, hdcp2_cap;
+ if (!intel_connector->hdcp.shim) {
+ seq_puts(m, "No Connector Support");
+ goto out;
+ }
+
hdcp_cap = intel_hdcp_capable(intel_connector);
hdcp2_cap = intel_hdcp2_capable(intel_connector);
@@ -608,6 +613,7 @@ static void intel_hdcp_info(struct seq_file *m,
if (!hdcp_cap && !hdcp2_cap)
seq_puts(m, "None");
+out:
seq_puts(m, "\n");
}
@@ -624,10 +630,6 @@ static void intel_dp_info(struct seq_file *m,
drm_dp_downstream_debug(m, intel_dp->dpcd, intel_dp->downstream_ports,
&intel_dp->aux);
- if (intel_connector->hdcp.shim) {
- seq_puts(m, "\tHDCP version: ");
- intel_hdcp_info(m, intel_connector);
- }
}
static void intel_dp_mst_info(struct seq_file *m,
@@ -651,10 +653,6 @@ static void intel_hdmi_info(struct seq_file *m,
struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(intel_encoder);
seq_printf(m, "\taudio support: %s\n", yesno(intel_hdmi->has_audio));
- if (intel_connector->hdcp.shim) {
- seq_puts(m, "\tHDCP version: ");
- intel_hdcp_info(m, intel_connector);
- }
}
static void intel_lvds_info(struct seq_file *m,
@@ -710,6 +708,9 @@ static void intel_connector_info(struct seq_file *m,
break;
}
+ seq_puts(m, "\tHDCP version: ");
+ intel_hdcp_info(m, intel_connector);
+
seq_printf(m, "\tmodes:\n");
list_for_each_entry(mode, &connector->modes, head)
intel_seq_print_mode(m, 2, mode);
--
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2020-02-27 18:57 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-18 22:02 [PATCH v4 00/14] drm/i915: Add support for HDCP 1.4 over MST connectors Sean Paul
2020-02-18 22:02 ` [Intel-gfx] " Sean Paul
2020-02-18 22:02 ` [PATCH v4 01/14] drm/i915: Fix sha_text population code Sean Paul
2020-02-18 22:02 ` [Intel-gfx] " Sean Paul
2020-02-18 22:02 ` Sean Paul
2020-02-20 12:49 ` Sasha Levin
2020-02-20 12:49 ` [Intel-gfx] " Sasha Levin
2020-02-18 22:02 ` [PATCH v4 02/14] drm/i915: Clear the repeater bit on HDCP disable Sean Paul
2020-02-18 22:02 ` [Intel-gfx] " Sean Paul
2020-02-18 22:02 ` Sean Paul
2020-02-18 22:02 ` [PATCH v4 03/14] drm/i915: WARN if HDCP signalling is enabled upon disable Sean Paul
2020-02-18 22:02 ` [Intel-gfx] " Sean Paul
2020-02-18 22:02 ` [PATCH v4 04/14] drm/i915: Intercept Aksv writes in the aux hooks Sean Paul
2020-02-18 22:02 ` [Intel-gfx] " Sean Paul
2020-02-18 22:02 ` [PATCH v4 05/14] drm/i915: Use the cpu_transcoder in intel_hdcp to toggle HDCP signalling Sean Paul
2020-02-18 22:02 ` [Intel-gfx] " Sean Paul
2020-02-18 22:02 ` [PATCH v4 06/14] drm/i915: Factor out hdcp->value assignments Sean Paul
2020-02-18 22:02 ` [Intel-gfx] " Sean Paul
2020-02-18 22:02 ` [PATCH v4 07/14] drm/i915: Protect workers against disappearing connectors Sean Paul
2020-02-18 22:02 ` [Intel-gfx] " Sean Paul
2020-02-18 22:02 ` [PATCH v4 08/14] drm/i915: Don't fully disable HDCP on a port if multiple pipes are using it Sean Paul
2020-02-18 22:02 ` [Intel-gfx] " Sean Paul
2020-02-18 22:02 ` [PATCH v4 09/14] drm/i915: Support DP MST in enc_to_dig_port() function Sean Paul
2020-02-18 22:02 ` [Intel-gfx] " Sean Paul
2020-02-18 22:02 ` [PATCH v4 10/14] drm/i915: Use ddi_update_pipe in intel_dp_mst Sean Paul
2020-02-18 22:02 ` [Intel-gfx] " Sean Paul
2020-02-18 22:02 ` [PATCH v4 11/14] drm/i915: Factor out HDCP shim functions from dp for use by dp_mst Sean Paul
2020-02-18 22:02 ` [Intel-gfx] " Sean Paul
2020-02-18 22:02 ` [PATCH v4 12/14] drm/i915: Add connector to hdcp_shim->check_link() Sean Paul
2020-02-18 22:02 ` [Intel-gfx] " Sean Paul
2020-02-18 22:02 ` [PATCH v4 13/14] drm/mst: Add support for QUERY_STREAM_ENCRYPTION_STATUS MST sideband message Sean Paul
2020-02-18 22:02 ` [Intel-gfx] " Sean Paul
2020-02-28 22:51 ` Lyude Paul
2020-02-28 22:51 ` [Intel-gfx] " Lyude Paul
2020-02-18 22:02 ` [PATCH v4 14/14] drm/i915: Add HDCP 1.4 support for MST connectors Sean Paul
2020-02-18 22:02 ` [Intel-gfx] " Sean Paul
2020-02-19 2:46 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Add support for HDCP 1.4 over MST connectors (rev4) Patchwork
2020-02-19 3:16 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2020-02-20 16:14 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2020-02-22 0:53 ` [PATCH v4 00/14] drm/i915: Add support for HDCP 1.4 over MST connectors Li, Juston
2020-02-22 0:53 ` [Intel-gfx] " Li, Juston
2020-02-27 18:56 ` Sean Paul [this message]
2020-02-27 18:56 ` [Intel-gfx] [PATCH v4 13.5/14] drm/i915: Print HDCP version info for all connectors Sean Paul
2020-02-27 23:42 ` Li, Juston
2020-02-27 23:42 ` [Intel-gfx] " Li, Juston
2020-02-28 7:47 ` Ramalingam C
2020-02-28 7:47 ` [Intel-gfx] " Ramalingam C
2020-02-28 0:33 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
2020-02-29 8:22 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
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=20200227185714.171466-1-sean@poorly.run \
--to=sean@poorly.run \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=juston.li@intel.com \
--cc=rodrigo.vivi@intel.com \
--cc=seanpaul@chromium.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.