Intel-XE Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: "Jouni Högander" <jouni.hogander@intel.com>
To: intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org
Cc: "Jouni Högander" <jouni.hogander@intel.com>,
	"Mika Kahola" <mika.kahola@intel.com>
Subject: [PATCH v3 2/4] drm/i915/psr: Add new define for PSR idle timeout
Date: Fri,  5 Sep 2025 10:27:06 +0300	[thread overview]
Message-ID: <20250905072708.2659411-3-jouni.hogander@intel.com> (raw)
In-Reply-To: <20250905072708.2659411-1-jouni.hogander@intel.com>

Currently we are using value 50ms as timeout for waiting PSR to idle. Add
own define for this purpose.

Signed-off-by: Jouni Högander <jouni.hogander@intel.com>
Reviewed-by: Mika Kahola <mika.kahola@intel.com>
---
 drivers/gpu/drm/i915/display/intel_psr.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
index 6ab5c028845a..eae1eedbbb26 100644
--- a/drivers/gpu/drm/i915/display/intel_psr.c
+++ b/drivers/gpu/drm/i915/display/intel_psr.c
@@ -2997,6 +2997,14 @@ void intel_psr_post_plane_update(struct intel_atomic_state *state,
 	}
 }
 
+/*
+ * From bspec: Panel Self Refresh (BDW+)
+ * Max. time for PSR to idle = Inverse of the refresh rate + 6 ms of
+ * exit training time + 1.5 ms of aux channel handshake. 50 ms is
+ * defensive enough to cover everything.
+ */
+#define PSR_IDLE_TIMEOUT_MS 50
+
 static int
 _psr2_ready_for_pipe_update_locked(const struct intel_crtc_state *new_crtc_state)
 {
@@ -3010,7 +3018,8 @@ _psr2_ready_for_pipe_update_locked(const struct intel_crtc_state *new_crtc_state
 	 */
 	return intel_de_wait_for_clear(display,
 				       EDP_PSR2_STATUS(display, cpu_transcoder),
-				       EDP_PSR2_STATUS_STATE_DEEP_SLEEP, 50);
+				       EDP_PSR2_STATUS_STATE_DEEP_SLEEP,
+				       PSR_IDLE_TIMEOUT_MS);
 }
 
 static int
@@ -3019,15 +3028,10 @@ _psr1_ready_for_pipe_update_locked(const struct intel_crtc_state *new_crtc_state
 	struct intel_display *display = to_intel_display(new_crtc_state);
 	enum transcoder cpu_transcoder = new_crtc_state->cpu_transcoder;
 
-	/*
-	 * From bspec: Panel Self Refresh (BDW+)
-	 * Max. time for PSR to idle = Inverse of the refresh rate + 6 ms of
-	 * exit training time + 1.5 ms of aux channel handshake. 50 ms is
-	 * defensive enough to cover everything.
-	 */
 	return intel_de_wait_for_clear(display,
 				       psr_status_reg(display, cpu_transcoder),
-				       EDP_PSR_STATUS_STATE_MASK, 50);
+				       EDP_PSR_STATUS_STATE_MASK,
+				       PSR_IDLE_TIMEOUT_MS);
 }
 
 /**
-- 
2.43.0


  parent reply	other threads:[~2025-09-05  7:27 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-09-05  7:27 [PATCH v3 0/4] Wait PSR idle before on dsb commit Jouni Högander
2025-09-05  7:27 ` [PATCH v3 1/4] drm/i915/psr: Pass intel_crtc_state instead of intel_dp in wait_for_idle Jouni Högander
2025-09-05  7:27 ` Jouni Högander [this message]
2025-09-05  7:27 ` [PATCH v3 3/4] drm/i915/psr: New interface adding PSR idle poll into dsb commit Jouni Högander
2025-09-05  7:27 ` [PATCH v3 4/4] drm/i915/psr: Add poll for checking PSR is idle before starting update Jouni Högander
2025-09-05  9:17   ` Ville Syrjälä
2025-09-05  8:00 ` ✓ CI.KUnit: success for Wait PSR idle before on dsb commit (rev3) Patchwork
2025-09-05  8:15 ` ✗ CI.checksparse: warning " Patchwork
2025-09-05 18:02 ` ✗ Xe.CI.Full: failure " Patchwork
2025-09-08  5:09 ` ✓ CI.KUnit: success for Wait PSR idle before on dsb commit (rev4) Patchwork
2025-09-08  5:24 ` ✗ CI.checksparse: warning " Patchwork
2025-09-08  5:41 ` ✓ Xe.CI.BAT: success " Patchwork
2025-09-08  6:54 ` ✓ Xe.CI.Full: " Patchwork
2025-09-08  7:32 ` [PATCH v3 0/4] Wait PSR idle before on dsb commit Hogander, Jouni

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=20250905072708.2659411-3-jouni.hogander@intel.com \
    --to=jouni.hogander@intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=intel-xe@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