[PATCH v2 0/2] tests/intel/kms_psr: DP2.1 PR IGT Fixes

[PATCH v2 0/2] tests/intel/kms_psr: DP2.1 PR IGT Fixes

[Naladala Ramanaidu]

This patch set contains fixes for DP2.1 Panel Replay issues we have
found while debugging the code. These issues are related to DP2.1
monitor always being MST. Also wrong usage of SRD_STATUS and
PSR2_STATUS registers are fixed.

Naladala Ramanaidu (2):
  lib/igt_psr: Remove SRD status change check for DP2.1 Panel Replay
  lib/igt_psr: Fix PR state check for DisplayPort connectors

 lib/igt_psr.c | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

-- 
2.43.0

[PATCH v2 1/2] lib/igt_psr: Remove SRD status change check for DP2.1 Panel Replay

[Naladala Ramanaidu]

We do not have ALPM on the DP2.1 Panel Replay. Due to this, the
SRD_STATUS [SRD State] doesn't change from SRDENT_ON after Panel
Replay is enabled until it gets disabled. As a result, the igt
tests fail. To resolve this issue, add a condition to skip the
check in the 'psr_wait_update' and 'psr_long_wait_update'
functions for DP2.1 PR.

v1: Update change for all users of psr_wait_update and
    psr_long_wait_update. (Jouni)

Signed-off-by: Naladala Ramanaidu <ramanaidu.naladala@intel.com>
---
 lib/igt_psr.c | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/lib/igt_psr.c b/lib/igt_psr.c
index e3e7577eb..2677d4822 100644
--- a/lib/igt_psr.c
+++ b/lib/igt_psr.c
@@ -113,12 +113,28 @@ bool psr_wait_entry(int debugfs_fd, enum psr_mode mode, igt_output_t *output)
 
 bool psr_wait_update(int debugfs_fd, enum psr_mode mode, igt_output_t *output)
 {
-	return igt_wait(!psr_active_check(debugfs_fd, mode, output), 40, 1);
+	/*
+	 * TODO: After enabling Panel Replay on DP2.1, observe that the SRD status
+	 * remains in the SRDENT_ON state. Remove the polling mechanism for the SRD
+	 * status change for the DP2.1 output.
+	 */
+	if (output->config.connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort)
+		return igt_wait(psr_active_check(debugfs_fd, mode, output), 40, 1);
+	else
+		return igt_wait(!psr_active_check(debugfs_fd, mode, output), 40, 1);
 }
 
 bool psr_long_wait_update(int debugfs_fd, enum psr_mode mode, igt_output_t *output)
 {
-	return igt_wait(!psr_active_check(debugfs_fd, mode, output), 500, 1);
+	/*
+	 * TODO: After enabling Panel Replay on DP2.1, observe that the SRD status
+	 * remains in the SRDENT_ON state. Remove the polling mechanism for the SRD
+	 * status change for the DP2.1 output.
+	 */
+	if (output->config.connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort)
+		return igt_wait(psr_active_check(debugfs_fd, mode, output), 500, 1);
+	else
+		return igt_wait(!psr_active_check(debugfs_fd, mode, output), 500, 1);
 }
 
 static ssize_t psr_write(int debugfs_fd, const char *buf, igt_output_t *output)
-- 
2.43.0

[PATCH v2 2/2] lib/igt_psr: Fix PR state check for DisplayPort connectors

[Naladala Ramanaidu]

The PR state check logic has been updated to handle DisplayPort
connectors.

Signed-off-by: Naladala Ramanaidu <ramanaidu.naladala@intel.com>
---
 lib/igt_psr.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/igt_psr.c b/lib/igt_psr.c
index 2677d4822..09107cd5b 100644
--- a/lib/igt_psr.c
+++ b/lib/igt_psr.c
@@ -79,8 +79,9 @@ static bool psr_active_check(int debugfs_fd, enum psr_mode mode, igt_output_t *o
 		c = output->config.connector;
 	}
 
-	if ((mode == PR_MODE || mode == PR_MODE_SEL_FETCH) &&
-	    c && c->connector_type == DRM_MODE_CONNECTOR_eDP)
+	if (c->connector_type == DRM_MODE_CONNECTOR_DisplayPort)
+		state = "SRDENT_ON";
+	else if (mode == PR_MODE || mode == PR_MODE_SEL_FETCH)
 		state = "SLEEP";
 	else if (mode == PSR_MODE_1 || mode == PR_MODE || mode == PR_MODE_SEL_FETCH)
 		state = "SRDENT";
-- 
2.43.0

Re: [PATCH v2 0/2] tests/intel/kms_psr: DP2.1 PR IGT Fixes

[Hogander, Jouni]

On Tue, 2024-09-10 at 13:09 +0530, Naladala Ramanaidu wrote:
> This patch set contains fixes for DP2.1 Panel Replay issues we have
> found while debugging the code. These issues are related to DP2.1
> monitor always being MST. Also wrong usage of SRD_STATUS and
> PSR2_STATUS registers are fixed.

For the whole set:

Reviewed-by: Jouni Högander <jouni.hogander@intel.com>

> 
> Naladala Ramanaidu (2):
>   lib/igt_psr: Remove SRD status change check for DP2.1 Panel Replay
>   lib/igt_psr: Fix PR state check for DisplayPort connectors
> 
>  lib/igt_psr.c | 25 +++++++++++++++++++++----
>  1 file changed, 21 insertions(+), 4 deletions(-)
>