From: "Jouni Högander" <jouni.hogander@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: animesh.manna@intel.com, mika.kahola@intel.com,
"Jouni Högander" <jouni.hogander@intel.com>
Subject: [PATCH v3 16/20] drm/i915/psr: HW will not allow PR on eDP when HDCP enabled
Date: Mon, 27 May 2024 10:22:16 +0300 [thread overview]
Message-ID: <20240527072220.3294769-17-jouni.hogander@intel.com> (raw)
In-Reply-To: <20240527072220.3294769-1-jouni.hogander@intel.com>
Take into account in Panel Replay compute config that HW will not allow PR
on eDP when HDCP enabled.
Signed-off-by: Jouni Högander <jouni.hogander@intel.com>
---
drivers/gpu/drm/i915/display/intel_psr.c | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
index ed2c23e8ce55..455ad13d9903 100644
--- a/drivers/gpu/drm/i915/display/intel_psr.c
+++ b/drivers/gpu/drm/i915/display/intel_psr.c
@@ -1711,8 +1711,13 @@ static bool _psr_compute_config(struct intel_dp *intel_dp,
static bool
_panel_replay_compute_config(struct intel_dp *intel_dp,
- const struct intel_crtc_state *crtc_state)
+ const struct intel_crtc_state *crtc_state,
+ const struct drm_connector_state *conn_state)
{
+ struct intel_connector *connector =
+ to_intel_connector(conn_state->connector);
+ struct intel_hdcp *hdcp = &connector->hdcp;
+
if (!CAN_PANEL_REPLAY(intel_dp))
return false;
@@ -1725,6 +1730,14 @@ _panel_replay_compute_config(struct intel_dp *intel_dp,
if (intel_dp_is_uhbr(crtc_state))
return false;
+ /* HW will not allow Panel Replay on eDP when HDCP enabled */
+ if (conn_state->content_protection ==
+ DRM_MODE_CONTENT_PROTECTION_DESIRED ||
+ (conn_state->content_protection ==
+ DRM_MODE_CONTENT_PROTECTION_ENABLED && hdcp->value ==
+ DRM_MODE_CONTENT_PROTECTION_UNDESIRED))
+ return false;
+
return true;
}
@@ -1764,7 +1777,8 @@ void intel_psr_compute_config(struct intel_dp *intel_dp,
}
crtc_state->has_panel_replay = _panel_replay_compute_config(intel_dp,
- crtc_state);
+ crtc_state,
+ conn_state);
crtc_state->has_psr = crtc_state->has_panel_replay ? true :
_psr_compute_config(intel_dp, crtc_state);
--
2.34.1
next prev parent reply other threads:[~2024-05-27 7:23 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-27 7:22 [PATCH v3 00/20] Panel Replay eDP support Jouni Högander
2024-05-27 7:22 ` [PATCH v3 01/20] drm/i915/psr: Store pr_dpcd in intel_dp Jouni Högander
2024-05-28 6:27 ` Manna, Animesh
2024-05-27 7:22 ` [PATCH v3 02/20] drm/panel replay: Add edp1.5 Panel Replay bits and register Jouni Högander
2024-05-28 6:28 ` Manna, Animesh
2024-05-28 13:02 ` Maarten Lankhorst
2024-05-27 7:22 ` [PATCH v3 03/20] drm/i915/psr: Move printing sink PSR support to own function Jouni Högander
2024-05-28 6:29 ` Manna, Animesh
2024-05-27 7:22 ` [PATCH v3 04/20] drm/i915/psr: Move printing PSR mode " Jouni Högander
2024-05-28 6:30 ` Manna, Animesh
2024-05-27 7:22 ` [PATCH v3 05/20] drm/i915/psr: modify psr status debugfs to support eDP Panel Replay Jouni Högander
2024-05-28 6:40 ` Manna, Animesh
2024-05-27 7:22 ` [PATCH v3 06/20] drm/i915/psr: Add Panel Replay support to intel_psr2_config_et_valid Jouni Högander
2024-05-29 7:20 ` Manna, Animesh
2024-05-27 7:22 ` [PATCH v3 07/20] drm/i915/psr: Add Early Transport into psr debugfs interface Jouni Högander
2024-05-29 7:21 ` Manna, Animesh
2024-05-27 7:22 ` [PATCH v3 08/20] drm/display: Add missing aux less alpm wake related bits Jouni Högander
2024-05-27 7:22 ` [PATCH v3 09/20] drm/i915/psr: Check panel ALPM capability for eDP Panel Replay Jouni Högander
2024-05-27 7:22 ` [PATCH v3 10/20] drm/i915/psr: Inform Panel Replay source support on eDP as well Jouni Högander
2024-05-27 7:22 ` [PATCH v3 11/20] drm/i915/psr: enable sink for eDP1.5 Panel Replay Jouni Högander
2024-05-27 7:22 ` [PATCH v3 12/20] drm/i915/psr: Check panel Early Transport capability for eDP PR Jouni Högander
2024-05-27 7:22 ` [PATCH v3 13/20] drm/i915/psr: Perfrom psr2 checks related to ALPM for Panel Replay Jouni Högander
2024-05-27 7:22 ` [PATCH v3 14/20] drm/i915/psr: Add Panel Replay compute_config helper Jouni Högander
2024-05-27 7:22 ` [PATCH v3 15/20] drm/i915/psr: 128b/132b Panel Replay is not supported on eDP Jouni Högander
2024-05-27 7:22 ` Jouni Högander [this message]
2024-05-27 7:22 ` [PATCH v3 17/20] drm/i915/psr: Check Early Transport for Panel Replay as well Jouni Högander
2024-05-27 7:22 ` [PATCH v3 18/20] drm/i915/psr: Modify dg2_activate_panel_replay to support eDP Jouni Högander
2024-05-27 7:22 ` [PATCH v3 19/20] drm/i915/psr: Add new debug bit to disable Panel Replay Jouni Högander
2024-05-27 7:22 ` [PATCH v3 20/20] Revert "drm/i915/psr: Disable early transport by default" Jouni Högander
2024-05-27 7:50 ` ✗ Fi.CI.CHECKPATCH: warning for Panel Replay eDP support (rev3) Patchwork
2024-05-27 7:50 ` ✗ Fi.CI.SPARSE: " Patchwork
2024-05-27 8:08 ` ✗ Fi.CI.BAT: failure " Patchwork
2024-05-27 10:25 ` ✗ Fi.CI.CHECKPATCH: warning for Panel Replay eDP support (rev4) Patchwork
2024-05-27 10:25 ` ✗ Fi.CI.SPARSE: " Patchwork
2024-05-27 10:35 ` ✗ Fi.CI.BAT: failure " Patchwork
2024-05-27 11:25 ` ✓ Fi.CI.BAT: success " Patchwork
2024-05-27 16:15 ` ✗ Fi.CI.IGT: 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=20240527072220.3294769-17-jouni.hogander@intel.com \
--to=jouni.hogander@intel.com \
--cc=animesh.manna@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=mika.kahola@intel.com \
/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