From: Sean Paul <sean@poorly.run> To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, freedreno@lists.freedesktop.org Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>, jani.nikula@intel.com, abhinavk@codeaurora.org, swboyd@chromium.org, David Airlie <airlied@linux.ie>, Sean Paul <seanpaul@chromium.org>, Thomas Zimmermann <tzimmermann@suse.de>, Rodrigo Vivi <rodrigo.vivi@intel.com>, bjorn.andersson@linaro.org Subject: [PATCH v4 02/14] drm/hdcp: Avoid changing crtc state in hdcp atomic check Date: Thu, 4 Nov 2021 23:04:19 -0400 [thread overview] Message-ID: <20211105030434.2828845-3-sean@poorly.run> (raw) In-Reply-To: <20211105030434.2828845-1-sean@poorly.run> From: Sean Paul <seanpaul@chromium.org> Instead of forcing a modeset in the hdcp atomic check, simply return true if the content protection value is changing and let the driver decide whether a modeset is required or not. Acked-by: Jani Nikula <jani.nikula@intel.com> Signed-off-by: Sean Paul <seanpaul@chromium.org> Link: https://patchwork.freedesktop.org/patch/msgid/20210913175747.47456-3-sean@poorly.run #v1 Link: https://patchwork.freedesktop.org/patch/msgid/20210915203834.1439-3-sean@poorly.run #v2 Link: https://patchwork.freedesktop.org/patch/msgid/20211001151145.55916-3-sean@poorly.run #v3 Changes in v2: -None Changes in v3: -None Changes in v4: -None --- drivers/gpu/drm/drm_hdcp.c | 33 +++++++++++++++------ drivers/gpu/drm/i915/display/intel_atomic.c | 5 ++-- include/drm/drm_hdcp.h | 2 +- 3 files changed, 27 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/drm_hdcp.c b/drivers/gpu/drm/drm_hdcp.c index 522326b03e66..dd8fa91c51d6 100644 --- a/drivers/gpu/drm/drm_hdcp.c +++ b/drivers/gpu/drm/drm_hdcp.c @@ -430,11 +430,14 @@ EXPORT_SYMBOL(drm_hdcp_update_content_protection); * @connector: drm_connector on which content protection state needs an update * * This function can be used by display drivers to perform an atomic check on the - * hdcp state elements. If hdcp state has changed, this function will set - * mode_changed on the crtc driving the connector so it can update its hardware - * to match the hdcp state. + * hdcp state elements. If hdcp state has changed in a manner which requires the + * driver to enable or disable content protection, this function will return + * true. + * + * Returns: + * true if the driver must enable/disable hdcp, false otherwise */ -void drm_hdcp_atomic_check(struct drm_connector *connector, +bool drm_hdcp_atomic_check(struct drm_connector *connector, struct drm_atomic_state *state) { struct drm_connector_state *new_conn_state, *old_conn_state; @@ -452,10 +455,12 @@ void drm_hdcp_atomic_check(struct drm_connector *connector, * If the connector is being disabled with CP enabled, mark it * desired so it's re-enabled when the connector is brought back */ - if (old_hdcp == DRM_MODE_CONTENT_PROTECTION_ENABLED) + if (old_hdcp == DRM_MODE_CONTENT_PROTECTION_ENABLED) { new_conn_state->content_protection = DRM_MODE_CONTENT_PROTECTION_DESIRED; - return; + return true; + } + return false; } new_crtc_state = drm_atomic_get_new_crtc_state(state, @@ -467,9 +472,19 @@ void drm_hdcp_atomic_check(struct drm_connector *connector, */ if (drm_atomic_crtc_needs_modeset(new_crtc_state) && (old_hdcp == DRM_MODE_CONTENT_PROTECTION_ENABLED && - new_hdcp != DRM_MODE_CONTENT_PROTECTION_UNDESIRED)) + new_hdcp != DRM_MODE_CONTENT_PROTECTION_UNDESIRED)) { new_conn_state->content_protection = DRM_MODE_CONTENT_PROTECTION_DESIRED; + return true; + } + + /* + * Coming back from disable or changing CRTC with DESIRED state requires + * that the driver try CP enable. + */ + if (new_hdcp == DRM_MODE_CONTENT_PROTECTION_DESIRED && + new_conn_state->crtc != old_conn_state->crtc) + return true; /* * Nothing to do if content type is unchanged and one of: @@ -484,9 +499,9 @@ void drm_hdcp_atomic_check(struct drm_connector *connector, new_hdcp == DRM_MODE_CONTENT_PROTECTION_DESIRED)) { if (old_conn_state->hdcp_content_type == new_conn_state->hdcp_content_type) - return; + return false; } - new_crtc_state->mode_changed = true; + return true; } EXPORT_SYMBOL(drm_hdcp_atomic_check); diff --git a/drivers/gpu/drm/i915/display/intel_atomic.c b/drivers/gpu/drm/i915/display/intel_atomic.c index 1e306e8427ec..c7b5470c40aa 100644 --- a/drivers/gpu/drm/i915/display/intel_atomic.c +++ b/drivers/gpu/drm/i915/display/intel_atomic.c @@ -122,8 +122,6 @@ int intel_digital_connector_atomic_check(struct drm_connector *conn, to_intel_digital_connector_state(old_state); struct drm_crtc_state *crtc_state; - drm_hdcp_atomic_check(conn, state); - if (!new_state->crtc) return 0; @@ -139,7 +137,8 @@ int intel_digital_connector_atomic_check(struct drm_connector *conn, new_conn_state->base.picture_aspect_ratio != old_conn_state->base.picture_aspect_ratio || new_conn_state->base.content_type != old_conn_state->base.content_type || new_conn_state->base.scaling_mode != old_conn_state->base.scaling_mode || - !drm_connector_atomic_hdr_metadata_equal(old_state, new_state)) + !drm_connector_atomic_hdr_metadata_equal(old_state, new_state) || + drm_hdcp_atomic_check(conn, state)) crtc_state->mode_changed = true; return 0; diff --git a/include/drm/drm_hdcp.h b/include/drm/drm_hdcp.h index d49977a042e1..e6e3d16bc7d3 100644 --- a/include/drm/drm_hdcp.h +++ b/include/drm/drm_hdcp.h @@ -301,7 +301,7 @@ int drm_connector_attach_content_protection_property( struct drm_connector *connector, bool hdcp_content_type); void drm_hdcp_update_content_protection(struct drm_connector *connector, u64 val); -void drm_hdcp_atomic_check(struct drm_connector *connector, +bool drm_hdcp_atomic_check(struct drm_connector *connector, struct drm_atomic_state *state); /* Content Type classification for HDCP2.2 vs others */ -- Sean Paul, Software Engineer, Google / Chromium OS
WARNING: multiple messages have this Message-ID (diff)
From: Sean Paul <sean@poorly.run> To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, freedreno@lists.freedesktop.org Cc: jani.nikula@intel.com, abhinavk@codeaurora.org, swboyd@chromium.org, David Airlie <airlied@linux.ie>, Sean Paul <seanpaul@chromium.org>, Maxime Ripard <mripard@kernel.org>, Thomas Zimmermann <tzimmermann@suse.de>, bjorn.andersson@linaro.org Subject: [Intel-gfx] [PATCH v4 02/14] drm/hdcp: Avoid changing crtc state in hdcp atomic check Date: Thu, 4 Nov 2021 23:04:19 -0400 [thread overview] Message-ID: <20211105030434.2828845-3-sean@poorly.run> (raw) In-Reply-To: <20211105030434.2828845-1-sean@poorly.run> From: Sean Paul <seanpaul@chromium.org> Instead of forcing a modeset in the hdcp atomic check, simply return true if the content protection value is changing and let the driver decide whether a modeset is required or not. Acked-by: Jani Nikula <jani.nikula@intel.com> Signed-off-by: Sean Paul <seanpaul@chromium.org> Link: https://patchwork.freedesktop.org/patch/msgid/20210913175747.47456-3-sean@poorly.run #v1 Link: https://patchwork.freedesktop.org/patch/msgid/20210915203834.1439-3-sean@poorly.run #v2 Link: https://patchwork.freedesktop.org/patch/msgid/20211001151145.55916-3-sean@poorly.run #v3 Changes in v2: -None Changes in v3: -None Changes in v4: -None --- drivers/gpu/drm/drm_hdcp.c | 33 +++++++++++++++------ drivers/gpu/drm/i915/display/intel_atomic.c | 5 ++-- include/drm/drm_hdcp.h | 2 +- 3 files changed, 27 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/drm_hdcp.c b/drivers/gpu/drm/drm_hdcp.c index 522326b03e66..dd8fa91c51d6 100644 --- a/drivers/gpu/drm/drm_hdcp.c +++ b/drivers/gpu/drm/drm_hdcp.c @@ -430,11 +430,14 @@ EXPORT_SYMBOL(drm_hdcp_update_content_protection); * @connector: drm_connector on which content protection state needs an update * * This function can be used by display drivers to perform an atomic check on the - * hdcp state elements. If hdcp state has changed, this function will set - * mode_changed on the crtc driving the connector so it can update its hardware - * to match the hdcp state. + * hdcp state elements. If hdcp state has changed in a manner which requires the + * driver to enable or disable content protection, this function will return + * true. + * + * Returns: + * true if the driver must enable/disable hdcp, false otherwise */ -void drm_hdcp_atomic_check(struct drm_connector *connector, +bool drm_hdcp_atomic_check(struct drm_connector *connector, struct drm_atomic_state *state) { struct drm_connector_state *new_conn_state, *old_conn_state; @@ -452,10 +455,12 @@ void drm_hdcp_atomic_check(struct drm_connector *connector, * If the connector is being disabled with CP enabled, mark it * desired so it's re-enabled when the connector is brought back */ - if (old_hdcp == DRM_MODE_CONTENT_PROTECTION_ENABLED) + if (old_hdcp == DRM_MODE_CONTENT_PROTECTION_ENABLED) { new_conn_state->content_protection = DRM_MODE_CONTENT_PROTECTION_DESIRED; - return; + return true; + } + return false; } new_crtc_state = drm_atomic_get_new_crtc_state(state, @@ -467,9 +472,19 @@ void drm_hdcp_atomic_check(struct drm_connector *connector, */ if (drm_atomic_crtc_needs_modeset(new_crtc_state) && (old_hdcp == DRM_MODE_CONTENT_PROTECTION_ENABLED && - new_hdcp != DRM_MODE_CONTENT_PROTECTION_UNDESIRED)) + new_hdcp != DRM_MODE_CONTENT_PROTECTION_UNDESIRED)) { new_conn_state->content_protection = DRM_MODE_CONTENT_PROTECTION_DESIRED; + return true; + } + + /* + * Coming back from disable or changing CRTC with DESIRED state requires + * that the driver try CP enable. + */ + if (new_hdcp == DRM_MODE_CONTENT_PROTECTION_DESIRED && + new_conn_state->crtc != old_conn_state->crtc) + return true; /* * Nothing to do if content type is unchanged and one of: @@ -484,9 +499,9 @@ void drm_hdcp_atomic_check(struct drm_connector *connector, new_hdcp == DRM_MODE_CONTENT_PROTECTION_DESIRED)) { if (old_conn_state->hdcp_content_type == new_conn_state->hdcp_content_type) - return; + return false; } - new_crtc_state->mode_changed = true; + return true; } EXPORT_SYMBOL(drm_hdcp_atomic_check); diff --git a/drivers/gpu/drm/i915/display/intel_atomic.c b/drivers/gpu/drm/i915/display/intel_atomic.c index 1e306e8427ec..c7b5470c40aa 100644 --- a/drivers/gpu/drm/i915/display/intel_atomic.c +++ b/drivers/gpu/drm/i915/display/intel_atomic.c @@ -122,8 +122,6 @@ int intel_digital_connector_atomic_check(struct drm_connector *conn, to_intel_digital_connector_state(old_state); struct drm_crtc_state *crtc_state; - drm_hdcp_atomic_check(conn, state); - if (!new_state->crtc) return 0; @@ -139,7 +137,8 @@ int intel_digital_connector_atomic_check(struct drm_connector *conn, new_conn_state->base.picture_aspect_ratio != old_conn_state->base.picture_aspect_ratio || new_conn_state->base.content_type != old_conn_state->base.content_type || new_conn_state->base.scaling_mode != old_conn_state->base.scaling_mode || - !drm_connector_atomic_hdr_metadata_equal(old_state, new_state)) + !drm_connector_atomic_hdr_metadata_equal(old_state, new_state) || + drm_hdcp_atomic_check(conn, state)) crtc_state->mode_changed = true; return 0; diff --git a/include/drm/drm_hdcp.h b/include/drm/drm_hdcp.h index d49977a042e1..e6e3d16bc7d3 100644 --- a/include/drm/drm_hdcp.h +++ b/include/drm/drm_hdcp.h @@ -301,7 +301,7 @@ int drm_connector_attach_content_protection_property( struct drm_connector *connector, bool hdcp_content_type); void drm_hdcp_update_content_protection(struct drm_connector *connector, u64 val); -void drm_hdcp_atomic_check(struct drm_connector *connector, +bool drm_hdcp_atomic_check(struct drm_connector *connector, struct drm_atomic_state *state); /* Content Type classification for HDCP2.2 vs others */ -- Sean Paul, Software Engineer, Google / Chromium OS
next prev parent reply other threads:[~2021-11-05 3:04 UTC|newest] Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-11-05 3:04 [PATCH v4 00/14] drm/hdcp: Pull HDCP auth/exchange/check into helpers Sean Paul 2021-11-05 3:04 ` [Intel-gfx] " Sean Paul 2021-11-05 3:04 ` [PATCH v4 01/14] drm/hdcp: Add drm_hdcp_atomic_check() Sean Paul 2021-11-05 3:04 ` [Intel-gfx] " Sean Paul 2021-11-05 3:04 ` Sean Paul [this message] 2021-11-05 3:04 ` [Intel-gfx] [PATCH v4 02/14] drm/hdcp: Avoid changing crtc state in hdcp atomic check Sean Paul 2021-11-05 3:04 ` [PATCH v4 03/14] drm/hdcp: Update property value on content type and user changes Sean Paul 2021-11-05 3:04 ` [Intel-gfx] " Sean Paul 2021-11-05 3:04 ` [PATCH v4 04/14] drm/hdcp: Expand HDCP helper library for enable/disable/check Sean Paul 2021-11-05 3:04 ` [Intel-gfx] " Sean Paul 2021-11-05 3:04 ` [PATCH v4 05/14] drm/i915/hdcp: Consolidate HDCP setup/state cache Sean Paul 2021-11-05 3:04 ` [Intel-gfx] " Sean Paul 2021-11-05 3:04 ` [PATCH v4 06/14] drm/i915/hdcp: Retain hdcp_capable return codes Sean Paul 2021-11-05 3:04 ` [Intel-gfx] " Sean Paul 2021-11-05 3:04 ` [PATCH v4 07/14] drm/i915/hdcp: Use HDCP helpers for i915 Sean Paul 2021-11-05 3:04 ` [Intel-gfx] " Sean Paul 2021-11-05 3:04 ` [PATCH v4 08/14] drm/msm/dpu_kms: Re-order dpu includes Sean Paul 2021-11-05 3:04 ` [Intel-gfx] " Sean Paul 2021-11-05 3:04 ` Sean Paul 2021-11-05 3:04 ` [PATCH v4 09/14] drm/msm/dpu: Remove useless checks in dpu_encoder Sean Paul 2021-11-05 3:04 ` [Intel-gfx] " Sean Paul 2021-11-05 3:04 ` Sean Paul 2021-11-05 3:04 ` [PATCH v4 10/14] drm/msm/dpu: Remove encoder->enable() hack Sean Paul 2021-11-05 3:04 ` [Intel-gfx] " Sean Paul 2021-11-05 3:04 ` Sean Paul 2021-11-05 3:04 ` [PATCH v4 11/14] drm/msm/dp: Re-order dp_audio_put in deinit_sub_modules Sean Paul 2021-11-05 3:04 ` [Intel-gfx] " Sean Paul 2021-11-05 3:04 ` Sean Paul 2021-11-05 3:04 ` [PATCH v4 12/14] dt-bindings: msm/dp: Add bindings for HDCP registers Sean Paul 2021-11-05 3:04 ` [Intel-gfx] " Sean Paul 2021-11-05 3:04 ` Sean Paul 2021-11-12 22:06 ` Rob Herring 2021-11-12 22:06 ` [Intel-gfx] " Rob Herring 2021-11-12 22:06 ` Rob Herring 2021-11-15 20:21 ` [PATCH v4.5 " Sean Paul 2021-11-15 20:21 ` Sean Paul 2021-11-15 20:21 ` [Intel-gfx] " Sean Paul 2021-11-29 22:03 ` Rob Herring 2021-11-29 22:03 ` Rob Herring 2021-11-29 22:03 ` [Intel-gfx] " Rob Herring 2021-11-05 3:04 ` [PATCH v4 13/14] arm64: dts: qcom: sc7180: Add support for HDCP in dp-controller Sean Paul 2021-11-05 3:04 ` [Intel-gfx] " Sean Paul 2021-11-05 3:04 ` Sean Paul 2021-12-08 22:06 ` [Freedreno] " Rob Clark 2021-12-08 22:06 ` [Intel-gfx] " Rob Clark 2021-12-08 22:06 ` Rob Clark 2021-11-05 3:04 ` [PATCH v4 14/14] drm/msm: Implement HDCP 1.x using the new drm HDCP helpers Sean Paul 2021-11-05 3:04 ` [Intel-gfx] " Sean Paul 2021-11-05 3:04 ` Sean Paul 2021-12-09 3:31 ` Stephen Boyd 2021-12-09 3:31 ` Stephen Boyd 2021-12-09 3:31 ` [Intel-gfx] " Stephen Boyd 2022-02-09 21:41 ` Dmitry Baryshkov 2022-02-09 21:41 ` [Intel-gfx] " Dmitry Baryshkov 2022-02-09 21:41 ` Dmitry Baryshkov 2021-11-05 3:20 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/hdcp: Pull HDCP auth/exchange/check into helpers (rev3) Patchwork 2021-11-05 3:22 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork 2021-11-05 3:52 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork 2021-11-15 20:32 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/hdcp: Pull HDCP auth/exchange/check into helpers (rev4) Patchwork 2021-11-15 20:34 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork 2021-11-15 20:37 ` [Intel-gfx] ✗ Fi.CI.DOCS: " Patchwork 2021-11-15 20:58 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork 2021-12-08 20:55 ` [Freedreno] [PATCH v4 00/14] drm/hdcp: Pull HDCP auth/exchange/check into helpers Rob Clark 2021-12-08 20:55 ` [Intel-gfx] " Rob Clark
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=20211105030434.2828845-3-sean@poorly.run \ --to=sean@poorly.run \ --cc=abhinavk@codeaurora.org \ --cc=airlied@linux.ie \ --cc=bjorn.andersson@linaro.org \ --cc=dri-devel@lists.freedesktop.org \ --cc=freedreno@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ --cc=jani.nikula@intel.com \ --cc=rodrigo.vivi@intel.com \ --cc=seanpaul@chromium.org \ --cc=swboyd@chromium.org \ --cc=tvrtko.ursulin@linux.intel.com \ --cc=tzimmermann@suse.de \ /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: linkBe 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.