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@p... #v2 Link: https://patchwork.freedesktop.org/patch/msgid/20200117193103.156821-3-sean@p... #v3 Link: https://patchwork.freedesktop.org/patch/msgid/20200218220242.107265-3-sean@p... #v4 Link: https://patchwork.freedesktop.org/patch/msgid/20200305201236.152307-3-sean@p... #v5
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 --- drivers/gpu/drm/i915/display/intel_hdcp.c | 6 ++++++ 1 file changed, 6 insertions(+)
diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c index 525658fd201f..20175a53643d 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");
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.6.7, v5.4.35, v4.19.118.
v5.6.7: Build failed! Errors: drivers/gpu/drm/i915/display/intel_hdcp.c:780:2: error: implicit declaration of function ‘intel_de_write’; did you mean ‘intel_sbi_write’? [-Werror=implicit-function-declaration] drivers/gpu/drm/i915/display/intel_hdcp.c:781:10: error: implicit declaration of function ‘intel_de_read’; did you mean ‘intel_sbi_read’? [-Werror=implicit-function-declaration]
v5.4.35: Failed to apply! Possible dependencies: 692059318c0f ("drm/i915/hdcp: Enable HDCP 1.4 and 2.2 on Gen12+")
v4.19.118: Failed to apply! Possible dependencies: 0e39037b3165 ("drm/i915: Cache the error string") 16e4dd0342a8 ("drm/i915: Markup paired operations on wakerefs") 39e2f501c1b4 ("drm/i915: Split struct intel_context definition to its own header") 408bd9178666 ("drm/i915: extract intel_hdcp.h from intel_drv.h") 52c0fdb25c7c ("drm/i915: Replace global breadcrumbs with per-context interrupt tracking") 538ef96b9dae ("drm/i915/gem: Track the rpm wakerefs") 692059318c0f ("drm/i915/hdcp: Enable HDCP 1.4 and 2.2 on Gen12+") 6b048706f407 ("drm/i915: Forcibly flush unwanted requests in drop-caches") 87f1ef225242 ("drm/i915: Record the sseu configuration per-context & engine") 95fd94a645f7 ("drm/i915: avoid rebuilding i915_gpu_error.o on version string updates") c0a6aa7ec2c3 ("drm/i915: Show actual alongside requested frequency in debugfs/i915_rps_boost_info") c2400ec3b6d1 ("drm/i915: add Makefile magic for testing headers are self-contained") c44301fce614 ("drm/i915: Allow control of PSR at runtime through debugfs, v6") e0516e83640e ("drm/i915: Move sandybride pcode access to intel_sideband.c") e1ef734eaec5 ("drm/i915: make intel_frontbuffer.h self-contained") e6154e4cb8b0 ("drm/i915: Skip the ERR_PTR error state") eb8d0f5af4ec ("drm/i915: Remove GPU reset dependence on struct_mutex") fb6f0b64e455 ("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?
On 2020-04-29 at 15:54:48 -0400, Sean Paul wrote:
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
Just reconfirming my R-b here.
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@p... #v2 Link: https://patchwork.freedesktop.org/patch/msgid/20200117193103.156821-3-sean@p... #v3 Link: https://patchwork.freedesktop.org/patch/msgid/20200218220242.107265-3-sean@p... #v4 Link: https://patchwork.freedesktop.org/patch/msgid/20200305201236.152307-3-sean@p... #v5
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
drivers/gpu/drm/i915/display/intel_hdcp.c | 6 ++++++ 1 file changed, 6 insertions(+)
diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c index 525658fd201f..20175a53643d 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");
-- Sean Paul, Software Engineer, Google / Chromium OS
linux-stable-mirror@lists.linaro.org
-
Ramalingam C -
Sasha Levin -
Sean Paul