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 v2 7/9] drm/i915/display: Skip Panel Replay on pipe comparison if no active planes
Date: Tue, 21 May 2024 11:41:21 +0300	[thread overview]
Message-ID: <20240521084123.1984075-8-jouni.hogander@intel.com> (raw)
In-Reply-To: <20240521084123.1984075-1-jouni.hogander@intel.com>

Panel Replay is not enabled if there are no active planes. Do not compare
it on pipe comparison. Otherwise we get pipe mismatch.

Fixes: ac9ef327327b ("drm/i915/psr: Panel replay has to be enabled before link training")
Signed-off-by: Jouni Högander <jouni.hogander@intel.com>
---
 drivers/gpu/drm/i915/display/intel_display.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index cce1420fb541..fdbc2bced5b5 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -5320,7 +5320,9 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,
 	 * Panel replay has to be enabled before link training. PSR doesn't have
 	 * this requirement -> check these only if using panel replay
 	 */
-	if (current_config->has_panel_replay || pipe_config->has_panel_replay) {
+	if (current_config->active_planes &&
+	    (current_config->has_panel_replay ||
+	     pipe_config->has_panel_replay)) {
 		PIPE_CONF_CHECK_BOOL(has_psr);
 		PIPE_CONF_CHECK_BOOL(has_sel_update);
 		PIPE_CONF_CHECK_BOOL(enable_psr2_sel_fetch);
-- 
2.34.1


  parent reply	other threads:[~2024-05-21  8:42 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-05-21  8:41 [PATCH v2 0/9] Panel Replay Fixes Jouni Högander
2024-05-21  8:41 ` [PATCH v2 1/9] drm/i915/psr: Do not use fast_wake_lines for aux less wake time Jouni Högander
2024-05-21  8:41 ` [PATCH v2 2/9] drm/i915/psr: Add Early Transport status boolean into intel_psr Jouni Högander
2024-05-21  8:41 ` [PATCH v2 3/9] drm/i915/psr: Get Early Transport status in intel_psr_pipe_get_config Jouni Högander
2024-05-21  8:41 ` [PATCH v2 4/9] drm/i915/psr: Use enable boolean from intel_crtc_state for Early Transport Jouni Högander
2024-05-21  8:41 ` [PATCH v2 5/9] drm/i915/psr: Allow setting I915_PSR_DEBUG_SU_REGION_ET_DISABLE via debugfs Jouni Högander
2024-05-21  8:41 ` [PATCH v2 6/9] drm/i915/display: Take panel replay into account in vsc sdp unpacking Jouni Högander
2024-05-21  8:41 ` Jouni Högander [this message]
2024-05-21  8:41 ` [PATCH v2 8/9] drm/i915/psr: Write also AUX Less Wake lines into ALPM_CTL Jouni Högander
2024-05-21  8:41 ` [PATCH v2 9/9] drm/i915/display: Selective fetch Y position on Region Early Transport Jouni Högander
2024-05-21  9:37 ` ✗ Fi.CI.SPARSE: warning for Panel Replay Fixes (rev2) Patchwork
2024-05-21  9:51 ` ✓ Fi.CI.BAT: success " Patchwork
2024-05-22  4:14 ` ✗ 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=20240521084123.1984075-8-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