Intel-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Sean Paul <sean@poorly.run>
To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org,
	juston.li@intel.com, jani.nikula@linux.intel.com,
	joonas.lahtinen@linux.intel.com, rodrigo.vivi@intel.com,
	anshuman.gupta@intel.com
Cc: David Airlie <airlied@linux.ie>,
	daniel.vetter@ffwll.ch, Sean Paul <seanpaul@chromium.org>
Subject: [Intel-gfx] [PATCH v8 08/17] drm/i915: Clean up intel_hdcp_disable
Date: Tue, 18 Aug 2020 11:38:56 -0400	[thread overview]
Message-ID: <20200818153910.27894-9-sean@poorly.run> (raw)
In-Reply-To: <20200818153910.27894-1-sean@poorly.run>

From: Sean Paul <seanpaul@chromium.org>

Add an out label and un-indent hdcp disable in preparation for
hdcp_mutex. No functional changes

Reviewed-by: Anshuman Gupta <anshuman.gupta@intel.com>
Reviewed-by: Ramalingam C <ramalingam.c@intel.com>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20200429195502.39919-9-sean@poorly.run #v6
Link: https://patchwork.freedesktop.org/patch/msgid/20200623155907.22961-9-sean@poorly.run #v7

Changes in v7:
-Split into separate patch (Ramalingam)
Changes in v8:
-None
---
 drivers/gpu/drm/i915/display/intel_hdcp.c | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
index fe9377a6e4d5..4de87012659b 100644
--- a/drivers/gpu/drm/i915/display/intel_hdcp.c
+++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
@@ -2112,16 +2112,17 @@ int intel_hdcp_disable(struct intel_connector *connector)
 
 	mutex_lock(&hdcp->mutex);
 
-	if (hdcp->value != DRM_MODE_CONTENT_PROTECTION_UNDESIRED) {
-		intel_hdcp_update_value(connector,
-					DRM_MODE_CONTENT_PROTECTION_UNDESIRED,
-					false);
-		if (hdcp->hdcp2_encrypted)
-			ret = _intel_hdcp2_disable(connector);
-		else if (hdcp->hdcp_encrypted)
-			ret = _intel_hdcp_disable(connector);
-	}
+	if (hdcp->value == DRM_MODE_CONTENT_PROTECTION_UNDESIRED)
+		goto out;
 
+	intel_hdcp_update_value(connector,
+				DRM_MODE_CONTENT_PROTECTION_UNDESIRED, false);
+	if (hdcp->hdcp2_encrypted)
+		ret = _intel_hdcp2_disable(connector);
+	else if (hdcp->hdcp_encrypted)
+		ret = _intel_hdcp_disable(connector);
+
+out:
 	mutex_unlock(&hdcp->mutex);
 	cancel_delayed_work_sync(&hdcp->check_work);
 	return ret;
-- 
Sean Paul, Software Engineer, Google / Chromium OS

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  parent reply	other threads:[~2020-08-18 15:40 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-18 15:38 [Intel-gfx] [PATCH v8 00/17] drm/i915: Add support for HDCP 1.4 over MST Sean Paul
2020-08-18 15:38 ` [Intel-gfx] [PATCH v8 01/17] drm/i915: Fix sha_text population code Sean Paul
2020-08-26 13:53   ` Sasha Levin
2020-08-18 15:38 ` [Intel-gfx] [PATCH v8 02/17] drm/i915: Clear the repeater bit on HDCP disable Sean Paul
2020-08-26 13:53   ` Sasha Levin
2020-08-18 15:38 ` [Intel-gfx] [PATCH v8 03/17] drm/i915: WARN if HDCP signalling is enabled upon disable Sean Paul
2020-08-18 15:38 ` [Intel-gfx] [PATCH v8 04/17] drm/i915: Intercept Aksv writes in the aux hooks Sean Paul
2020-08-18 15:38 ` [Intel-gfx] [PATCH v8 05/17] drm/i915: Use the cpu_transcoder in intel_hdcp to toggle HDCP signalling Sean Paul
2020-08-18 15:38 ` [Intel-gfx] [PATCH v8 06/17] drm/i915: Factor out hdcp->value assignments Sean Paul
2020-08-18 15:38 ` [Intel-gfx] [PATCH v8 07/17] drm/i915: Protect workers against disappearing connectors Sean Paul
2020-08-18 15:38 ` Sean Paul [this message]
2020-08-18 15:38 ` [Intel-gfx] [PATCH v8 09/17] drm/i915: Don't fully disable HDCP on a port if multiple pipes are using it Sean Paul
2020-08-18 15:38 ` [Intel-gfx] [PATCH v8 10/17] drm/i915: Support DP MST in enc_to_dig_port() function Sean Paul
2020-08-18 15:38 ` [Intel-gfx] [PATCH v8 11/17] drm/i915: Use ddi_update_pipe in intel_dp_mst Sean Paul
2020-08-18 15:39 ` [Intel-gfx] [PATCH v8 12/17] drm/i915: Factor out HDCP shim functions from dp for use by dp_mst Sean Paul
2020-08-18 15:39 ` [Intel-gfx] [PATCH v8 13/17] drm/i915: Plumb port through hdcp init Sean Paul
2020-08-18 15:39 ` [Intel-gfx] [PATCH v8 14/17] drm/i915: Add connector to hdcp_shim->check_link() Sean Paul
2020-08-18 15:39 ` [Intel-gfx] [PATCH v8 15/17] drm/mst: Add support for QUERY_STREAM_ENCRYPTION_STATUS MST sideband message Sean Paul
2020-08-18 22:12   ` Lyude Paul
2020-08-19 14:31     ` [Intel-gfx] [PATCH v8.5] " Sean Paul
2020-08-18 15:39 ` [Intel-gfx] [PATCH v8 16/17] drm/i915: Print HDCP version info for all connectors Sean Paul
2020-08-18 15:39 ` [Intel-gfx] [PATCH v8 17/17] drm/i915: Add HDCP 1.4 support for MST connectors Sean Paul
2020-08-18 16:04 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Add support for HDCP 1.4 over MST (rev2) Patchwork
2020-08-18 16:06 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2020-08-18 16:21 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2020-08-18 17:28 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2020-08-19 15:21 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Add support for HDCP 1.4 over MST (rev3) Patchwork
2020-08-19 15:23 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2020-08-19 15:38 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2020-08-20  7:24 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2020-09-01  7:39 ` [Intel-gfx] [PATCH v8 00/17] drm/i915: Add support for HDCP 1.4 over MST Ramalingam C

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=20200818153910.27894-9-sean@poorly.run \
    --to=sean@poorly.run \
    --cc=airlied@linux.ie \
    --cc=anshuman.gupta@intel.com \
    --cc=daniel.vetter@ffwll.ch \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=jani.nikula@linux.intel.com \
    --cc=joonas.lahtinen@linux.intel.com \
    --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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox