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 10/26] drm/i915/psr: Print Panel Replay status instead of frame lock status
Date: Wed, 5 Jun 2024 13:25:37 +0300 [thread overview]
Message-ID: <20240605102553.187309-11-jouni.hogander@intel.com> (raw)
In-Reply-To: <20240605102553.187309-1-jouni.hogander@intel.com>
Currently Panel Replay status printout is printing frame lock status. It
should print Panel Replay status instead. Panel Replay status register
field follows PSR status register field. Use existing PSR code for that.
Fixes: ef75c25e8fed ("drm/i915/panelreplay: Debugfs support for panel replay")
Signed-off-by: Jouni Högander <jouni.hogander@intel.com>
---
drivers/gpu/drm/i915/display/intel_psr.c | 22 +++++-----------------
1 file changed, 5 insertions(+), 17 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
index 7bdae0d0ea45..3530e5f44096 100644
--- a/drivers/gpu/drm/i915/display/intel_psr.c
+++ b/drivers/gpu/drm/i915/display/intel_psr.c
@@ -3579,16 +3579,9 @@ static int i915_psr_sink_status_show(struct seq_file *m, void *data)
"reserved",
"sink internal error",
};
- static const char * const panel_replay_status[] = {
- "Sink device frame is locked to the Source device",
- "Sink device is coasting, using the VTotal target",
- "Sink device is governing the frame rate (frame rate unlock is granted)",
- "Sink device in the process of re-locking with the Source device",
- };
const char *str;
int ret;
u8 status, error_status;
- u32 idx;
if (!(CAN_PSR(intel_dp) || CAN_PANEL_REPLAY(intel_dp))) {
seq_puts(m, "PSR/Panel-Replay Unsupported\n");
@@ -3602,16 +3595,11 @@ static int i915_psr_sink_status_show(struct seq_file *m, void *data)
if (ret)
return ret;
- str = "unknown";
- if (intel_dp->psr.panel_replay_enabled) {
- idx = (status & DP_SINK_FRAME_LOCKED_MASK) >> DP_SINK_FRAME_LOCKED_SHIFT;
- if (idx < ARRAY_SIZE(panel_replay_status))
- str = panel_replay_status[idx];
- } else if (intel_dp->psr.enabled) {
- idx = status & DP_PSR_SINK_STATE_MASK;
- if (idx < ARRAY_SIZE(sink_status))
- str = sink_status[idx];
- }
+ status &= DP_PSR_SINK_STATE_MASK;
+ if (status < ARRAY_SIZE(sink_status))
+ str = sink_status[status];
+ else
+ str = "unknown";
seq_printf(m, "Sink %s status: 0x%x [%s]\n", psr_mode_str(intel_dp), status, str);
--
2.34.1
next prev 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 ` Jouni Högander [this message]
2024-06-06 14:35 ` [PATCH v6 10/26] drm/i915/psr: Print Panel Replay status instead of frame lock status 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 ` [PATCH v6 17/26] drm/i915/psr: enable sink for eDP1.5 Panel Replay Jouni Högander
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-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