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 v5 15/19] drm/i915/psr: HW will not allow PR on eDP when HDCP enabled
Date: Mon, 3 Jun 2024 16:00:39 +0300 [thread overview]
Message-ID: <20240603130043.2615716-16-jouni.hogander@intel.com> (raw)
In-Reply-To: <20240603130043.2615716-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 03e650b24050..60b0725a98c3 100644
--- a/drivers/gpu/drm/i915/display/intel_psr.c
+++ b/drivers/gpu/drm/i915/display/intel_psr.c
@@ -1478,8 +1478,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;
@@ -1492,6 +1497,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;
}
@@ -1531,7 +1544,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-06-03 13:01 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-03 13:00 [PATCH v5 00/19] Panel Replay eDP support Jouni Högander
2024-06-03 13:00 ` [PATCH v5 01/19] drm/i915/alpm: Do not use fast_wake_lines for aux less wake time Jouni Högander
2024-06-03 13:00 ` [PATCH v5 02/19] drm/i915/alpm: Write also AUX Less Wake lines into ALPM_CTL Jouni Högander
2024-06-03 13:00 ` [PATCH v5 03/19] drm/i915/display: Take panel replay into account in vsc sdp unpacking Jouni Högander
2024-06-03 13:00 ` [PATCH v5 04/19] drm/i915/display: Skip Panel Replay on pipe comparison if no active planes Jouni Högander
2024-06-03 13:00 ` [PATCH v5 05/19] drm/i915/psr: Add Panel Replay support to intel_psr2_config_et_valid Jouni Högander
2024-06-03 13:00 ` [PATCH v5 06/19] drm/i915/alpm: Make alpm support checks non-static Jouni Högander
2024-06-03 13:00 ` [PATCH v5 07/19] drm/i915/psr: Check panel ALPM capability for eDP Panel Replay Jouni Högander
2024-06-03 13:00 ` [PATCH v5 08/19] drm/i915/psr: Use intel_alpm_aux_wake_supported instead of local variable Jouni Högander
2024-06-03 13:00 ` [PATCH v5 09/19] drm/i915/psr: Inform Panel Replay source support on eDP as well Jouni Högander
2024-06-03 13:00 ` [PATCH v5 10/19] drm/i915/psr: enable sink for eDP1.5 Panel Replay Jouni Högander
2024-06-03 13:00 ` [PATCH v5 11/19] drm/i915/psr: Check panel Early Transport capability for eDP PR Jouni Högander
2024-06-03 13:00 ` [PATCH v5 12/19] drm/i915/psr: Perfrom psr2 checks related to ALPM for Panel Replay Jouni Högander
2024-06-03 13:00 ` [PATCH v5 13/19] drm/i915/psr: Add Panel Replay compute_config helper Jouni Högander
2024-06-03 13:00 ` [PATCH v5 14/19] drm/i915/psr: 128b/132b Panel Replay is not supported on eDP Jouni Högander
2024-06-03 13:00 ` Jouni Högander [this message]
2024-06-03 13:00 ` [PATCH v5 16/19] drm/i915/psr: Check Early Transport for Panel Replay as well Jouni Högander
2024-06-03 13:00 ` [PATCH v5 17/19] drm/i915/psr: Modify dg2_activate_panel_replay to support eDP Jouni Högander
2024-06-03 13:00 ` [PATCH v5 18/19] drm/i915/psr: Add new debug bit to disable Panel Replay Jouni Högander
2024-06-03 13:00 ` [PATCH v5 19/19] Revert "drm/i915/psr: Disable early transport by default" Jouni Högander
2024-06-03 13:45 ` ✗ Fi.CI.SPARSE: warning for Panel Replay eDP support (rev6) Patchwork
2024-06-03 13:55 ` ✓ Fi.CI.BAT: success " Patchwork
2024-06-03 23:38 ` ✗ 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=20240603130043.2615716-16-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