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 10/13] drm/i915/psr: Move vblank length check to separate function
Date: Fri, 7 Jun 2024 16:49:14 +0300 [thread overview]
Message-ID: <20240607134917.1327574-11-jouni.hogander@intel.com> (raw)
In-Reply-To: <20240607134917.1327574-1-jouni.hogander@intel.com>
We are about to add more complexity to vblank length check. It makes sense
to move it to separate function for sake of clarity.
v2: change name to wake_lines_fit_into_vblank
Signed-off-by: Jouni Högander <jouni.hogander@intel.com>
---
drivers/gpu/drm/i915/display/intel_psr.c | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
index a292c6c5de30..98b0018704f3 100644
--- a/drivers/gpu/drm/i915/display/intel_psr.c
+++ b/drivers/gpu/drm/i915/display/intel_psr.c
@@ -1243,6 +1243,20 @@ static int intel_psr_entry_setup_frames(struct intel_dp *intel_dp,
return entry_setup_frames;
}
+static bool wake_lines_fit_into_vblank(struct intel_dp *intel_dp,
+ const struct intel_crtc_state *crtc_state)
+{
+ int vblank = crtc_state->hw.adjusted_mode.crtc_vblank_end -
+ crtc_state->hw.adjusted_mode.crtc_vblank_start;
+ int wake_lines = psr2_block_count_lines(intel_dp);
+
+ /* Vblank >= PSR2_CTL Block Count Number maximum line count */
+ if (vblank < wake_lines)
+ return false;
+
+ return true;
+}
+
static bool intel_psr2_config_valid(struct intel_dp *intel_dp,
struct intel_crtc_state *crtc_state)
{
@@ -1333,9 +1347,7 @@ static bool intel_psr2_config_valid(struct intel_dp *intel_dp,
}
/* Vblank >= PSR2_CTL Block Count Number maximum line count */
- if (crtc_state->hw.adjusted_mode.crtc_vblank_end -
- crtc_state->hw.adjusted_mode.crtc_vblank_start <
- psr2_block_count_lines(intel_dp)) {
+ if (!wake_lines_fit_into_vblank(intel_dp, crtc_state)) {
drm_dbg_kms(&dev_priv->drm,
"PSR2 not enabled, too short vblank time\n");
return false;
--
2.34.1
next prev parent reply other threads:[~2024-06-07 13:49 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-07 13:49 [PATCH 00/13] Panel Replay eDP prepare Jouni Högander
2024-06-07 13:49 ` [PATCH 01/13] drm/i915/alpm: Do not use fast_wake_lines for aux less wake time Jouni Högander
2024-06-07 13:49 ` [PATCH 02/13] drm/i915/alpm: Write also AUX Less Wake lines into ALPM_CTL Jouni Högander
2024-06-07 13:49 ` [PATCH 03/13] drm/i915/display: Take panel replay into account in vsc sdp unpacking Jouni Högander
2024-06-07 13:49 ` [PATCH 04/13] drm/i915/display: Skip Panel Replay on pipe comparison if no active planes Jouni Högander
2024-06-07 13:49 ` [PATCH 05/13] drm/display: Add missing Panel Replay Enable SU Region ET bit Jouni Högander
2024-06-11 9:55 ` Maarten Lankhorst
2024-06-07 13:49 ` [PATCH 06/13] drm/i915/psr: Split enabling sink for PSR and Panel Replay Jouni Högander
2024-06-07 13:49 ` [PATCH 07/13] drm/i915/alpm: Share alpm support checks with PSR code Jouni Högander
2024-06-07 13:49 ` [PATCH 08/13] drm/i915/psr: Add Panel Replay support to intel_psr2_config_et_valid Jouni Högander
2024-06-07 13:49 ` [PATCH 09/13] drm/i915/psr: Print Panel Replay status instead of frame lock status Jouni Högander
2024-06-07 13:49 ` Jouni Högander [this message]
2024-06-07 13:49 ` [PATCH 11/13] drm/i915/psr: Take into account SU SDP scanline indication in vblank check Jouni Högander
2024-06-07 13:49 ` [PATCH 12/13] drm/i915/psr: Check vblank against IO buffer wake time on Lunarlake Jouni Högander
2024-06-07 13:49 ` [PATCH 13/13] drm/i915/psr: Wake time is aux less wake time for Panel Replay Jouni Högander
2024-06-07 14:31 ` ✗ Fi.CI.CHECKPATCH: warning for Panel Replay eDP prepare Patchwork
2024-06-07 14:31 ` ✗ Fi.CI.SPARSE: " Patchwork
2024-06-07 14:40 ` ✓ Fi.CI.BAT: success " Patchwork
2024-06-07 23:41 ` ✗ Fi.CI.IGT: failure " Patchwork
2024-06-11 10:14 ` Hogander, Jouni
2024-06-10 9:30 ` [PATCH 00/13] " Manna, Animesh
2024-06-11 10:20 ` 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=20240607134917.1327574-11-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