[v7,02/17] drm/i915: Clear the repeater bit on HDCP disable

Commit Message

Sean Paul June 23, 2020, 3:58 p.m. UTC

From: Sean Paul <[e-mail]>

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 <[e-mail]>
Cc: Ramalingam C <[e-mail]>
Cc: Daniel Vetter <[e-mail]>
Cc: Sean Paul <[e-mail]>
Cc: Jani Nikula <[e-mail]>
Cc: Joonas Lahtinen <[e-mail]>
Cc: Rodrigo Vivi <[e-mail]>
Cc: [e-mail]
Cc: <[e-mail]> # v4.17+
Reviewed-by: Ramalingam C <[e-mail]>
Signed-off-by: Sean Paul <[e-mail]>
Link: https://patchwork.freedesktop.org/patch/msgid/[e-mail] #v2
Link: https://patchwork.freedesktop.org/patch/msgid/[e-mail] #v3
Link: https://patchwork.freedesktop.org/patch/msgid/[e-mail] #v4
Link: https://patchwork.freedesktop.org/patch/msgid/[e-mail] #v5
Link: https://patchwork.freedesktop.org/patch/msgid/[e-mail] #v6

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
Changes in v4:
-s/I915_(READ|WRITE)/intel_de_(read|write)/
Changes in v5:
-None
Changes in v6:
-None
Changes in v7:
-None
---
 drivers/gpu/drm/i915/display/intel_hdcp.c | 6 ++++++
 1 file changed, 6 insertions(+)

Comments

Sasha Levin June 25, 2020, 2:53 p.m. UTC | #1

Hi

[This is an automated email]

This commit has been processed because it contains a "Fixes:" tag
fixing commit: ee5e5e7a5e0f ("drm/i915: Add HDCP framework + base implementation").

The bot has tested the following trees: v5.7.5, v5.4.48, v4.19.129.

v5.7.5: Build OK!
v5.4.48: Failed to apply! Possible dependencies:
    692059318c0fc ("drm/i915/hdcp: Enable HDCP 1.4 and 2.2 on Gen12+")

v4.19.129: Failed to apply! Possible dependencies:
    0e39037b31655 ("drm/i915: Cache the error string")
    16e4dd0342a80 ("drm/i915: Markup paired operations on wakerefs")
    39e2f501c1b43 ("drm/i915: Split struct intel_context definition to its own header")
    408bd91786665 ("drm/i915: extract intel_hdcp.h from intel_drv.h")
    52c0fdb25c7c9 ("drm/i915: Replace global breadcrumbs with per-context interrupt tracking")
    538ef96b9dae7 ("drm/i915/gem: Track the rpm wakerefs")
    692059318c0fc ("drm/i915/hdcp: Enable HDCP 1.4 and 2.2 on Gen12+")
    6b048706f407f ("drm/i915: Forcibly flush unwanted requests in drop-caches")
    87f1ef225242d ("drm/i915: Record the sseu configuration per-context & engine")
    95fd94a645f75 ("drm/i915: avoid rebuilding i915_gpu_error.o on version string updates")
    c0a6aa7ec2c36 ("drm/i915: Show actual alongside requested frequency in debugfs/i915_rps_boost_info")
    c2400ec3b6d15 ("drm/i915: add Makefile magic for testing headers are self-contained")
    c44301fce6146 ("drm/i915: Allow control of PSR at runtime through debugfs, v6")
    e0516e83640e1 ("drm/i915: Move sandybride pcode access to intel_sideband.c")
    e1ef734eaec54 ("drm/i915: make intel_frontbuffer.h self-contained")
    e6154e4cb8b0d ("drm/i915: Skip the ERR_PTR error state")
    eb8d0f5af4ec2 ("drm/i915: Remove GPU reset dependence on struct_mutex")
    fb6f0b64e455b ("drm/i915: Prevent machine hang from Broxton's vtd w/a and error capture")


NOTE: The patch will not be queued to stable trees until it is upstream.

How should we proceed with this patch?

Patch

diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
index f26fee3b4624..9f530b2f3606 100644
--- a/drivers/gpu/drm/i915/display/intel_hdcp.c
+++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
@@ -795,6 +795,7 @@  static int _intel_hdcp_disable(struct intel_connector *connector)
 	struct intel_hdcp *hdcp = &connector->hdcp;
 	enum port port = intel_dig_port->base.port;
 	enum transcoder cpu_transcoder = hdcp->cpu_transcoder;
+	u32 repeater_ctl;
 	int ret;
 
 	drm_dbg_kms(&dev_priv->drm, "[%s:%d] HDCP is being disabled...\n",
@@ -810,6 +811,11 @@  static int _intel_hdcp_disable(struct intel_connector *connector)
 		return -ETIMEDOUT;
 	}
 
+	repeater_ctl = intel_hdcp_get_repeater_ctl(dev_priv, cpu_transcoder,
+						   port);
+	intel_de_write(dev_priv, HDCP_REP_CTL,
+		       intel_de_read(dev_priv, HDCP_REP_CTL) & ~repeater_ctl);
+
 	ret = hdcp->shim->toggle_signalling(intel_dig_port, false);
 	if (ret) {
 		drm_err(&dev_priv->drm, "Failed to disable HDCP signalling\n");