All of lore.kernel.org
 help / color / mirror / Atom feed
From: Anshuman Gupta <anshuman.gupta@intel.com>
To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org
Cc: jani.nikula@intel.com, seanpaul@chromium.org,
	juston.li@intel.com, Anshuman Gupta <anshuman.gupta@intel.com>
Subject: [PATCH v2 01/15] drm/i915/hdcp: Update CP property in update_pipe
Date: Tue, 20 Oct 2020 19:08:52 +0530	[thread overview]
Message-ID: <20201020133906.23710-2-anshuman.gupta@intel.com> (raw)
In-Reply-To: <20201020133906.23710-1-anshuman.gupta@intel.com>

When crtc state need_modeset is true it is not necessary
it is going to be a real modeset, it can turns to be a
update_pipe instead of modeset.
This turns content protection property to be DESIRED and hdcp
update_pipe left with property to be in DESIRED state but
actually hdcp->value was ENABLED.
This caught with DP MST setup, when disabling HDCP on a connector
sets the crtc state need_modeset to true for all crtc driving
the other DP-MST topology connectors.

Fixes: 33f9a623bfc6 ("drm/i915/hdcp: Update CP as per the kernel internal state")
Cc: Ramalingam C <ramalingam.c@intel.com>
Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com>
---
 drivers/gpu/drm/i915/display/intel_hdcp.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
index b2a4bbcfdcd2..cbe3ee661bb7 100644
--- a/drivers/gpu/drm/i915/display/intel_hdcp.c
+++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
@@ -2220,6 +2220,10 @@ void intel_hdcp_update_pipe(struct intel_atomic_state *state,
 		/* Avoid enabling hdcp, if it already ENABLED */
 		desired_and_not_enabled =
 			hdcp->value != DRM_MODE_CONTENT_PROTECTION_ENABLED;
+
+		if (!desired_and_not_enabled && !content_protection_type_changed)
+			schedule_work(&hdcp->prop_work);
+
 		mutex_unlock(&hdcp->mutex);
 	}
 
-- 
2.26.2

_______________________________________________
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: Anshuman Gupta <anshuman.gupta@intel.com>
To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org
Cc: jani.nikula@intel.com, seanpaul@chromium.org
Subject: [Intel-gfx] [PATCH v2 01/15] drm/i915/hdcp: Update CP property in update_pipe
Date: Tue, 20 Oct 2020 19:08:52 +0530	[thread overview]
Message-ID: <20201020133906.23710-2-anshuman.gupta@intel.com> (raw)
In-Reply-To: <20201020133906.23710-1-anshuman.gupta@intel.com>

When crtc state need_modeset is true it is not necessary
it is going to be a real modeset, it can turns to be a
update_pipe instead of modeset.
This turns content protection property to be DESIRED and hdcp
update_pipe left with property to be in DESIRED state but
actually hdcp->value was ENABLED.
This caught with DP MST setup, when disabling HDCP on a connector
sets the crtc state need_modeset to true for all crtc driving
the other DP-MST topology connectors.

Fixes: 33f9a623bfc6 ("drm/i915/hdcp: Update CP as per the kernel internal state")
Cc: Ramalingam C <ramalingam.c@intel.com>
Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com>
---
 drivers/gpu/drm/i915/display/intel_hdcp.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
index b2a4bbcfdcd2..cbe3ee661bb7 100644
--- a/drivers/gpu/drm/i915/display/intel_hdcp.c
+++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
@@ -2220,6 +2220,10 @@ void intel_hdcp_update_pipe(struct intel_atomic_state *state,
 		/* Avoid enabling hdcp, if it already ENABLED */
 		desired_and_not_enabled =
 			hdcp->value != DRM_MODE_CONTENT_PROTECTION_ENABLED;
+
+		if (!desired_and_not_enabled && !content_protection_type_changed)
+			schedule_work(&hdcp->prop_work);
+
 		mutex_unlock(&hdcp->mutex);
 	}
 
-- 
2.26.2

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

  reply	other threads:[~2020-10-20 13:49 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-20 13:38 [PATCH v2 00/15] HDCP 2.2 DP MST Support Anshuman Gupta
2020-10-20 13:38 ` [Intel-gfx] " Anshuman Gupta
2020-10-20 13:38 ` Anshuman Gupta [this message]
2020-10-20 13:38   ` [Intel-gfx] [PATCH v2 01/15] drm/i915/hdcp: Update CP property in update_pipe Anshuman Gupta
2020-10-20 13:38 ` [PATCH v2 02/15] drm/i915/hotplug: Handle CP_IRQ for DP-MST Anshuman Gupta
2020-10-20 13:38   ` [Intel-gfx] " Anshuman Gupta
2020-10-20 13:38 ` [PATCH v2 03/15] drm/i915/hdcp: DP MST transcoder for link and stream Anshuman Gupta
2020-10-20 13:38   ` [Intel-gfx] " Anshuman Gupta
2020-10-20 13:38 ` [PATCH v2 04/15] drm/i915/hdcp: Move HDCP enc status timeout to header Anshuman Gupta
2020-10-20 13:38   ` [Intel-gfx] " Anshuman Gupta
2020-10-20 13:38 ` [PATCH v2 05/15] drm/i915/hdcp: HDCP stream encryption support Anshuman Gupta
2020-10-20 13:38   ` [Intel-gfx] " Anshuman Gupta
2020-10-20 13:38 ` [PATCH v2 06/15] drm/i915/hdcp: Enable Gen12 HDCP 1.4 DP MST support Anshuman Gupta
2020-10-20 13:38   ` [Intel-gfx] " Anshuman Gupta
2020-10-20 13:38 ` [PATCH v2 07/15] drm/i915/hdcp: Pass dig_port to intel_hdcp_init Anshuman Gupta
2020-10-20 13:38   ` [Intel-gfx] " Anshuman Gupta
2020-10-20 13:38 ` [PATCH v2 08/15] drm/i915/hdcp: Encapsulate hdcp_port_data to dig_port Anshuman Gupta
2020-10-20 13:38   ` [Intel-gfx] " Anshuman Gupta
2020-10-20 13:39 ` [PATCH v2 09/15] misc/mei/hdcp: Fix AUTH_STREAM_REQ cmd buffer len Anshuman Gupta
2020-10-20 13:39   ` [Intel-gfx] " Anshuman Gupta
2020-10-20 18:32   ` Jani Nikula
2020-10-20 18:32     ` [Intel-gfx] " Jani Nikula
2020-10-21 16:30     ` Winkler, Tomas
2020-10-21 16:30       ` [Intel-gfx] " Winkler, Tomas
2020-10-20 13:39 ` [PATCH v2 10/15] drm/hdcp: Max MST content streams Anshuman Gupta
2020-10-20 13:39   ` [Intel-gfx] " Anshuman Gupta
2020-10-20 13:39 ` [PATCH v2 11/15] drm/i915/hdcp: mst streams support in hdcp port_data Anshuman Gupta
2020-10-20 13:39   ` [Intel-gfx] " Anshuman Gupta
2020-10-20 13:39 ` [PATCH v2 12/15] drm/i915/hdcp: Pass connector to check_2_2_link Anshuman Gupta
2020-10-20 13:39   ` [Intel-gfx] " Anshuman Gupta
2020-10-20 13:39 ` [PATCH v2 13/15] drm/i915/hdcp: Add HDCP 2.2 stream register Anshuman Gupta
2020-10-20 13:39   ` [Intel-gfx] " Anshuman Gupta
2020-10-20 13:39 ` [PATCH v2 14/15] drm/i915/hdcp: Support for HDCP 2.2 MST shim callbacks Anshuman Gupta
2020-10-20 13:39   ` [Intel-gfx] " Anshuman Gupta
2020-10-20 13:39 ` [PATCH v2 15/15] drm/i915/hdcp: Enable HDCP 2.2 MST support Anshuman Gupta
2020-10-20 13:39   ` [Intel-gfx] " Anshuman Gupta
2020-10-20 13:57 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for HDCP 2.2 DP MST Support (rev4) Patchwork
2020-10-20 13:58 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2020-10-20 14:27 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " 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=20201020133906.23710-2-anshuman.gupta@intel.com \
    --to=anshuman.gupta@intel.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=jani.nikula@intel.com \
    --cc=juston.li@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.