From: Sean Paul <sean@poorly.run>
To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org
Cc: daniel.vetter@ffwll.ch, rodrigo.vivi@intel.com,
Sean Paul <seanpaul@chromium.org>,
stable@vger.kernel.org
Subject: [PATCH v3 02/12] drm/i915: Clear the repeater bit on HDCP disable
Date: Fri, 17 Jan 2020 14:30:53 -0500 [thread overview]
Message-ID: <20200117193103.156821-3-sean@poorly.run> (raw)
In-Reply-To: <20200117193103.156821-1-sean@poorly.run>
From: Sean Paul <seanpaul@chromium.org>
On HDCP disable, clear the repeater bit. This ensures if we connect a
non-repeater sink after a repeater, the bit is in the state we expect.
Fixes: ee5e5e7a5e0f (drm/i915: Add HDCP framework + base implementation)
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Ramalingam C <ramalingam.c@intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Sean Paul <seanpaul@chromium.org>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Cc: <stable@vger.kernel.org> # v4.17+
Reviewed-by: Ramalingam C <ramalingam.c@intel.com>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20191212190230.188505-3-sean@poorly.run #v2
Changes in v2:
-Added to the set
Changes in v3:
-None
I had previously agreed that clearing the rep_ctl bits on enable would
also be a good idea. However when I committed that idea to code, it
didn't look right. So let's rely on enables and disables being paired
and everything outside of that will be considered a bug
---
drivers/gpu/drm/i915/display/intel_hdcp.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
index eaab9008feef..c4394c8e10eb 100644
--- a/drivers/gpu/drm/i915/display/intel_hdcp.c
+++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
@@ -773,6 +773,7 @@ static int _intel_hdcp_disable(struct intel_connector *connector)
struct intel_digital_port *intel_dig_port = conn_to_dig_port(connector);
enum port port = intel_dig_port->base.port;
enum transcoder cpu_transcoder = hdcp->cpu_transcoder;
+ u32 repeater_ctl;
int ret;
DRM_DEBUG_KMS("[%s:%d] HDCP is being disabled...\n",
@@ -787,6 +788,10 @@ static int _intel_hdcp_disable(struct intel_connector *connector)
return -ETIMEDOUT;
}
+ repeater_ctl = intel_hdcp_get_repeater_ctl(dev_priv, cpu_transcoder,
+ port);
+ I915_WRITE(HDCP_REP_CTL, I915_READ(HDCP_REP_CTL) & ~repeater_ctl);
+
ret = hdcp->shim->toggle_signalling(intel_dig_port, false);
if (ret) {
DRM_ERROR("Failed to disable HDCP signalling\n");
--
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2020-01-17 19:31 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-17 19:30 [PATCH v3 00/12] drm/i915: Add support for HDCP 1.4 over MST connectors Sean Paul
2020-01-17 19:30 ` [PATCH v3 01/12] drm/i915: Fix sha_text population code Sean Paul
2020-01-19 15:26 ` Sasha Levin
2020-01-17 19:30 ` Sean Paul [this message]
2020-01-19 15:26 ` [PATCH v3 02/12] drm/i915: Clear the repeater bit on HDCP disable Sasha Levin
2020-01-17 19:30 ` [PATCH v3 03/12] drm/i915: WARN if HDCP signalling is enabled upon disable Sean Paul
2020-01-17 19:30 ` [PATCH v3 04/12] drm/i915: Intercept Aksv writes in the aux hooks Sean Paul
2020-01-17 19:30 ` [PATCH v3 05/12] drm/i915: Use the cpu_transcoder in intel_hdcp to toggle HDCP signalling Sean Paul
2020-01-17 19:30 ` [PATCH v3 06/12] drm/i915: Factor out hdcp->value assignments Sean Paul
2020-01-17 19:30 ` [PATCH v3 07/12] drm/i915: Protect workers against disappearing connectors Sean Paul
2020-01-17 19:30 ` [PATCH v3 08/12] drm/i915: Don't fully disable HDCP on a port if multiple pipes are using it Sean Paul
2020-02-02 19:03 ` Ramalingam C
2020-02-18 22:07 ` Sean Paul
2020-01-17 19:31 ` [PATCH v3 09/12] drm/i915: Support DP MST in enc_to_dig_port() function Sean Paul
2020-01-17 19:31 ` [PATCH v3 10/12] drm/i915: Use ddi_update_pipe in intel_dp_mst Sean Paul
2020-01-17 19:31 ` [PATCH v3 11/12] drm/i915: Factor out HDCP shim functions from dp for use by dp_mst Sean Paul
2020-01-17 19:31 ` [PATCH v3 12/12] drm/i915: Add HDCP 1.4 support for MST connectors Sean Paul
2020-01-27 14:06 ` [PATCH v3 00/12] drm/i915: Add support for HDCP 1.4 over " Sean Paul
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=20200117193103.156821-3-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=rodrigo.vivi@intel.com \
--cc=seanpaul@chromium.org \
--cc=stable@vger.kernel.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).