From: "Jouni Högander" <jouni.hogander@intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH 09/12] drm/i915/psr: Split intel_psr2_config_valid for panel replay
Date: Thu, 4 Jan 2024 12:48:18 +0200 [thread overview]
Message-ID: <20240104104821.1822988-10-jouni.hogander@intel.com> (raw)
In-Reply-To: <20240104104821.1822988-1-jouni.hogander@intel.com>
Part of intel_psr2_config_valid is valid for panel replay. rename it as
intel_sel_update_config_valid. Split psr2 specific part and name it as
intel_psr2_config_valid.
Signed-off-by: Jouni Högander <jouni.hogander@intel.com>
---
drivers/gpu/drm/i915/display/intel_psr.c | 60 +++++++++++++++---------
1 file changed, 38 insertions(+), 22 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
index d311eed72be5..f3f9522787e7 100644
--- a/drivers/gpu/drm/i915/display/intel_psr.c
+++ b/drivers/gpu/drm/i915/display/intel_psr.c
@@ -1264,12 +1264,6 @@ static bool intel_psr2_config_valid(struct intel_dp *intel_dp,
return false;
}
- if (crtc_state->crc_enabled) {
- drm_dbg_kms(&dev_priv->drm,
- "PSR2 not enabled because it would inhibit pipe CRC calculation\n");
- return false;
- }
-
if (DISPLAY_VER(dev_priv) >= 12) {
psr_max_h = 5120;
psr_max_v = 3200;
@@ -1320,30 +1314,52 @@ static bool intel_psr2_config_valid(struct intel_dp *intel_dp,
return false;
}
- if (HAS_PSR2_SEL_FETCH(dev_priv)) {
- if (!intel_psr2_sel_fetch_config_valid(intel_dp, crtc_state) &&
- !HAS_PSR_HW_TRACKING(dev_priv)) {
- drm_dbg_kms(&dev_priv->drm,
- "PSR2 not enabled, selective fetch not valid and no HW tracking available\n");
- return false;
- }
- }
-
- if (!psr2_granularity_check(intel_dp, crtc_state)) {
- drm_dbg_kms(&dev_priv->drm, "PSR2 not enabled, SU granularity not compatible\n");
- goto unsupported;
- }
-
if (!crtc_state->enable_psr2_sel_fetch &&
(crtc_hdisplay > psr_max_h || crtc_vdisplay > psr_max_v)) {
drm_dbg_kms(&dev_priv->drm,
"PSR2 not enabled, resolution %dx%d > max supported %dx%d\n",
crtc_hdisplay, crtc_vdisplay,
psr_max_h, psr_max_v);
- goto unsupported;
+ return false;
}
tgl_dc3co_exitline_compute_config(intel_dp, crtc_state);
+
+ return true;
+}
+
+static bool intel_sel_update_config_valid(struct intel_dp *intel_dp,
+ struct intel_crtc_state *crtc_state)
+{
+ struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
+
+ if (HAS_PSR2_SEL_FETCH(dev_priv) &&
+ !intel_psr2_sel_fetch_config_valid(intel_dp, crtc_state) &&
+ !HAS_PSR_HW_TRACKING(dev_priv)) {
+ drm_dbg_kms(&dev_priv->drm,
+ "Selective update not enabled, selective fetch not valid and no HW tracking available\n");
+ goto unsupported;
+ }
+
+ if (crtc_state->has_psr && !intel_psr2_config_valid(intel_dp, crtc_state))
+ goto unsupported;
+
+ if (crtc_state->has_panel_replay && (DISPLAY_VER(dev_priv) < 14 ||
+ !intel_dp->psr.sink_panel_replay_su_support))
+ goto unsupported;
+
+ if (crtc_state->crc_enabled) {
+ drm_dbg_kms(&dev_priv->drm,
+ "Selective update not enabled because it would inhibit pipe CRC calculation\n");
+ goto unsupported;
+ }
+
+ if (!psr2_granularity_check(intel_dp, crtc_state)) {
+ drm_dbg_kms(&dev_priv->drm,
+ "Selective update not enabled, SU granularity not compatible\n");
+ goto unsupported;
+ }
+
return true;
unsupported:
@@ -1413,7 +1429,7 @@ void intel_psr_compute_config(struct intel_dp *intel_dp,
if (!(crtc_state->has_panel_replay || crtc_state->has_psr))
return;
- crtc_state->has_sel_update = intel_psr2_config_valid(intel_dp, crtc_state);
+ crtc_state->has_sel_update = intel_sel_update_config_valid(intel_dp, crtc_state);
}
void intel_psr_get_config(struct intel_encoder *encoder,
--
2.34.1
next prev parent reply other threads:[~2024-01-04 10:49 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-04 10:48 [PATCH 00/12] Panel replay selective update support Jouni Högander
2024-01-04 10:48 ` [PATCH 01/12] drm/i915/psr: Disable panel replay for now Jouni Högander
2024-01-04 10:48 ` [PATCH 02/12] drm/i915/psr: Do not check alpm on DP or capability change for panel replay Jouni Högander
2024-01-04 10:48 ` [PATCH 03/12] drm/i915/psr: Unify panel replay enable sink Jouni Högander
2024-01-04 10:48 ` [PATCH 04/12] drm/i915/psr: Rename has_psr2 as has_sel_update Jouni Högander
2024-01-04 10:48 ` [PATCH 05/12] drm/i915/psr: Rename psr2_enabled as sel_update_enabled Jouni Högander
2024-01-04 10:48 ` [PATCH 06/12] drm/i915/psr: Add some documentation of variables used in psr code Jouni Högander
2024-01-04 10:48 ` [PATCH 07/12] drm/i915/psr: Add sink_panel_replay_su_support to intel_psr Jouni Högander
2024-01-04 10:48 ` [PATCH 08/12] drm/i915/psr: Detect panel replay selective update support Jouni Högander
2024-01-04 10:48 ` Jouni Högander [this message]
2024-01-04 10:48 ` [PATCH 10/12] drm/panelreplay: dpcd register definition for panelreplay SU Jouni Högander
2024-01-04 10:59 ` Dmitry Baryshkov
2024-01-10 13:20 ` Hogander, Jouni
2024-01-04 10:48 ` [PATCH 11/12] drm/i915/psr: Modify intel_dp_get_su_granularity to support panel replay Jouni Högander
2024-01-04 10:48 ` [PATCH 12/12] drm/i915/psr: Add panel replay sel update support to debugfs interface Jouni Högander
2024-01-04 13:14 ` ✗ Fi.CI.CHECKPATCH: warning for Panel replay selective update support Patchwork
2024-01-04 13:14 ` ✗ Fi.CI.SPARSE: " Patchwork
2024-01-04 13:33 ` ✓ Fi.CI.BAT: success " Patchwork
2024-01-04 14:45 ` ✗ 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=20240104104821.1822988-10-jouni.hogander@intel.com \
--to=jouni.hogander@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
/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