Intel-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
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 v6 17/26] drm/i915/psr: enable sink for eDP1.5 Panel Replay
Date: Wed,  5 Jun 2024 13:25:44 +0300	[thread overview]
Message-ID: <20240605102553.187309-18-jouni.hogander@intel.com> (raw)
In-Reply-To: <20240605102553.187309-1-jouni.hogander@intel.com>

eDP1.5 allows Panel Replay on eDP as well. Take this into account when
enabling sink PSR/Panel Replay. Write also PANEL_REPLAY_CONFIG2 register
accordingly.

v3:
  - set DP_PANEL_REPLAY_CRC_VERIFICATION in PANEL_REPLAY_CONFIG2
  - PANEL_REPLAY_CONFIG2 is available in DP2.1 as well
v2: do not configure ALPM for DP2.0 Panel Replay

Signed-off-by: Jouni Högander <jouni.hogander@intel.com>
---
 drivers/gpu/drm/i915/display/intel_psr.c | 36 ++++++++++++++++++++----
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
index f13eb01966f5..171ea2a03ed6 100644
--- a/drivers/gpu/drm/i915/display/intel_psr.c
+++ b/drivers/gpu/drm/i915/display/intel_psr.c
@@ -692,6 +692,7 @@ static void _panel_replay_enable_sink(struct intel_dp *intel_dp,
 		DP_PANEL_REPLAY_UNRECOVERABLE_ERROR_EN |
 		DP_PANEL_REPLAY_RFB_STORAGE_ERROR_EN |
 		DP_PANEL_REPLAY_ACTIVE_FRAME_CRC_ERROR_EN;
+	u8 panel_replay_config2 = DP_PANEL_REPLAY_CRC_VERIFICATION;
 
 	if (crtc_state->has_sel_update)
 		val |= DP_PANEL_REPLAY_SU_ENABLE;
@@ -699,7 +700,14 @@ static void _panel_replay_enable_sink(struct intel_dp *intel_dp,
 	if (crtc_state->enable_psr2_su_region_et)
 		val |= DP_PANEL_REPLAY_ENABLE_SU_REGION_ET;
 
+	if (crtc_state->req_psr2_sdp_prior_scanline)
+		panel_replay_config2 |=
+			DP_PANEL_REPLAY_SU_REGION_SCANLINE_CAPTURE;
+
 	drm_dp_dpcd_writeb(&intel_dp->aux, PANEL_REPLAY_CONFIG, val);
+
+	drm_dp_dpcd_writeb(&intel_dp->aux, PANEL_REPLAY_CONFIG2,
+			   panel_replay_config2);
 }
 
 static void _psr_enable_sink(struct intel_dp *intel_dp,
@@ -727,15 +735,31 @@ static void _psr_enable_sink(struct intel_dp *intel_dp,
 	drm_dp_dpcd_writeb(&intel_dp->aux, DP_PSR_EN_CFG, val);
 }
 
+static void intel_psr_enable_sink_alpm(struct intel_dp *intel_dp,
+				       const struct intel_crtc_state *crtc_state)
+{
+	u8 val;
+
+	/*
+	 * eDP Panel Replay uses always ALPM
+	 * PSR2 uses ALPM but PSR1 doesn't
+	 */
+	if (!intel_dp_is_edp(intel_dp) || (!crtc_state->has_panel_replay &&
+					   !crtc_state->has_sel_update))
+		return;
+
+	val = DP_ALPM_ENABLE | DP_ALPM_LOCK_ERROR_IRQ_HPD_ENABLE;
+
+	if (crtc_state->has_panel_replay)
+		val |= DP_ALPM_MODE_AUX_LESS;
+
+	drm_dp_dpcd_writeb(&intel_dp->aux, DP_RECEIVER_ALPM_CONFIG, val);
+}
+
 void intel_psr_enable_sink(struct intel_dp *intel_dp,
 			   const struct intel_crtc_state *crtc_state)
 {
-	/* Enable ALPM at sink for psr2 */
-	if (!crtc_state->has_panel_replay && crtc_state->has_sel_update)
-		drm_dp_dpcd_writeb(&intel_dp->aux,
-				   DP_RECEIVER_ALPM_CONFIG,
-				   DP_ALPM_ENABLE |
-				   DP_ALPM_LOCK_ERROR_IRQ_HPD_ENABLE);
+	intel_psr_enable_sink_alpm(intel_dp, crtc_state);
 
 	crtc_state->has_panel_replay ?
 		_panel_replay_enable_sink(intel_dp, crtc_state) :
-- 
2.34.1


  parent reply	other threads:[~2024-06-05 10:26 UTC|newest]

Thread overview: 57+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-06-05 10:25 [PATCH v6 00/26] Panel Replay eDP support Jouni Högander
2024-06-05 10:25 ` [PATCH v6 01/26] drm/i915/alpm: Do not use fast_wake_lines for aux less wake time Jouni Högander
2024-06-06  8:47   ` Manna, Animesh
2024-06-05 10:25 ` [PATCH v6 02/26] drm/i915/alpm: Write also AUX Less Wake lines into ALPM_CTL Jouni Högander
2024-06-06  9:41   ` Manna, Animesh
2024-06-05 10:25 ` [PATCH v6 03/26] drm/i915/display: Take panel replay into account in vsc sdp unpacking Jouni Högander
2024-06-06  9:59   ` Manna, Animesh
2024-06-05 10:25 ` [PATCH v6 04/26] drm/i915/display: Skip Panel Replay on pipe comparison if no active planes Jouni Högander
2024-06-06 13:02   ` Manna, Animesh
2024-06-05 10:25 ` [PATCH v6 05/26] drm/display: Add missing Panel Replay Enable SU Region ET bit Jouni Högander
2024-06-06 13:04   ` Manna, Animesh
2024-06-05 10:25 ` [PATCH v6 06/26] drm/i915/psr: Split enabling sink for PSR and Panel Replay Jouni Högander
2024-06-07 11:59   ` Manna, Animesh
2024-06-05 10:25 ` [PATCH v6 07/26] drm/i915/alpm: Make alpm support checks non-static Jouni Högander
2024-06-06 14:44   ` Manna, Animesh
2024-06-06 15:49     ` Hogander, Jouni
2024-06-05 10:25 ` [PATCH v6 08/26] drm/i915/psr: Use intel_alpm_aux_wake_supported instead of local variable Jouni Högander
2024-06-05 10:25 ` [PATCH v6 09/26] drm/i915/psr: Add Panel Replay support to intel_psr2_config_et_valid Jouni Högander
2024-06-06 15:01   ` Manna, Animesh
2024-06-05 10:25 ` [PATCH v6 10/26] drm/i915/psr: Print Panel Replay status instead of frame lock status Jouni Högander
2024-06-06 14:35   ` Manna, Animesh
2024-06-06 15:37     ` Hogander, Jouni
2024-06-07  9:59       ` Manna, Animesh
2024-06-07 10:03         ` Hogander, Jouni
2024-06-07 10:09           ` Manna, Animesh
2024-06-07 10:10             ` Hogander, Jouni
2024-06-07 10:53               ` Manna, Animesh
2024-06-05 10:25 ` [PATCH v6 11/26] drm/i915/psr: Move vblank length check to separate function Jouni Högander
2024-06-06 14:58   ` Manna, Animesh
2024-06-06 15:41     ` Hogander, Jouni
2024-06-07 11:09       ` Manna, Animesh
2024-06-07 13:19         ` Hogander, Jouni
2024-06-07 13:37           ` Hogander, Jouni
2024-06-05 10:25 ` [PATCH v6 12/26] drm/i915/psr: Take into account SU SDP scanline indication in vblank check Jouni Högander
2024-06-06 15:02   ` Manna, Animesh
2024-06-05 10:25 ` [PATCH v6 13/26] drm/i915/psr: Check vblank against IO buffer wake time on Lunarlake Jouni Högander
2024-06-06 14:55   ` Manna, Animesh
2024-06-05 10:25 ` [PATCH v6 14/26] dmr/i915/psr: Wake time is aux less wake time for Panel Replay Jouni Högander
2024-06-06 13:26   ` Manna, Animesh
2024-06-06 15:47     ` Hogander, Jouni
2024-06-07 11:14       ` Manna, Animesh
2024-06-05 10:25 ` [PATCH v6 15/26] drm/i915/psr: Check panel ALPM capability for eDP " Jouni Högander
2024-06-05 10:25 ` [PATCH v6 16/26] drm/i915/psr: Inform Panel Replay source support on eDP as well Jouni Högander
2024-06-05 10:25 ` Jouni Högander [this message]
2024-06-05 10:25 ` [PATCH v6 18/26] drm/i915/psr: Check panel Early Transport capability for eDP PR Jouni Högander
2024-06-05 10:25 ` [PATCH v6 19/26] drm/i915/psr: Perfrom psr2 checks related to ALPM for Panel Replay Jouni Högander
2024-06-05 10:25 ` [PATCH v6 20/26] drm/i915/psr: Add Panel Replay compute_config helper Jouni Högander
2024-06-05 10:25 ` [PATCH v6 21/26] drm/i915/psr: 128b/132b Panel Replay is not supported on eDP Jouni Högander
2024-06-05 10:25 ` [PATCH v6 22/26] drm/i915/psr: HW will not allow PR on eDP when HDCP enabled Jouni Högander
2024-06-05 10:25 ` [PATCH v6 23/26] drm/i915/psr: Check Early Transport for Panel Replay as well Jouni Högander
2024-06-05 10:25 ` [PATCH v6 24/26] drm/i915/psr: Modify dg2_activate_panel_replay to support eDP Jouni Högander
2024-06-05 10:25 ` [PATCH v6 25/26] drm/i915/psr: Add new debug bit to disable Panel Replay Jouni Högander
2024-06-05 10:25 ` [PATCH v6 26/26] Revert "drm/i915/psr: Disable early transport by default" Jouni Högander
2024-06-05 13:42 ` ✗ Fi.CI.CHECKPATCH: warning for Panel Replay eDP support (rev7) Patchwork
2024-06-05 13:42 ` ✗ Fi.CI.SPARSE: " Patchwork
2024-06-05 13:50 ` ✓ Fi.CI.BAT: success " Patchwork
2024-06-05 17:32 ` ✗ 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=20240605102553.187309-18-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