[i-g-t 1/2] Revert "lib/igt_psr: Remove SRD status change check for DP2.1 Panel Replay"

[i-g-t 1/2] Revert "lib/igt_psr: Remove SRD status change check for DP2.1 Panel Replay"

[Bhanuprakash Modem]

Causing regression in CI BAT.

This reverts commit 99861b72ee396a57712bbd0993f3d037cb3e7d40.

Issue: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/2748
Cc: Naladala Ramanaidu <ramanaidu.naladala@intel.com>
Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
---
 lib/igt_psr.c | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/lib/igt_psr.c b/lib/igt_psr.c
index 09107cd5b..4e44f44e6 100644
--- a/lib/igt_psr.c
+++ b/lib/igt_psr.c
@@ -114,28 +114,12 @@ 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)
 {
-	/*
-	 * 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);
+	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)
 {
-	/*
-	 * 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);
+	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

[i-g-t 2/2] Revert "lib/igt_psr: Fix PR state check for DisplayPort connectors"

[Bhanuprakash Modem]

Causing regression in CI BAT.

This reverts commit 196c2cc9c945a66bb542fdefcf491ea62c1f885e.

Issue: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/2748
Cc: Naladala Ramanaidu <ramanaidu.naladala@intel.com>
Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
---
 lib/igt_psr.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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

Re: [i-g-t 2/2] Revert "lib/igt_psr: Fix PR state check for DisplayPort connectors"

[Naladala, Ramanaidu]

Acked-by: Naladala Ramanaidu <ramanaidu.naladala@intel.com>

On 9/11/2024 1:27 PM, Bhanuprakash Modem wrote:
> Causing regression in CI BAT.
> 
> This reverts commit 196c2cc9c945a66bb542fdefcf491ea62c1f885e.
> 
> Issue: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/2748
> Cc: Naladala Ramanaidu <ramanaidu.naladala@intel.com>
> Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
> ---
>   lib/igt_psr.c | 5 ++---
>   1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/lib/igt_psr.c b/lib/igt_psr.c
> index 4e44f44e6..e3e7577eb 100644
> --- a/lib/igt_psr.c
> +++ b/lib/igt_psr.c
> @@ -79,9 +79,8 @@ static bool psr_active_check(int debugfs_fd, enum psr_mode mode, igt_output_t *o
>   		c = output->config.connector;
>   	}
>   
> -	if (c->connector_type == DRM_MODE_CONNECTOR_DisplayPort)
> -		state = "SRDENT_ON";
> -	else if (mode == PR_MODE || mode == PR_MODE_SEL_FETCH)
> +	if ((mode == PR_MODE || mode == PR_MODE_SEL_FETCH) &&
> +	    c && c->connector_type == DRM_MODE_CONNECTOR_eDP)
>   		state = "SLEEP";
>   	else if (mode == PSR_MODE_1 || mode == PR_MODE || mode == PR_MODE_SEL_FETCH)
>   		state = "SRDENT";

RE: [i-g-t 1/2] Revert "lib/igt_psr: Remove SRD status change check for DP2.1 Panel Replay"

[Naladala, Ramanaidu]

Acked-by: Naladala Ramanaidu <ramanaidu.naladala@intel.com>

-----Original Message-----
From: Modem, Bhanuprakash <bhanuprakash.modem@intel.com> 
Sent: Wednesday, September 11, 2024 1:28 PM
To: igt-dev@lists.freedesktop.org
Cc: Modem, Bhanuprakash <bhanuprakash.modem@intel.com>; Naladala, Ramanaidu <ramanaidu.naladala@intel.com>
Subject: [i-g-t 1/2] Revert "lib/igt_psr: Remove SRD status change check for DP2.1 Panel Replay"

Causing regression in CI BAT.

This reverts commit 99861b72ee396a57712bbd0993f3d037cb3e7d40.

Issue: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/2748
Cc: Naladala Ramanaidu <ramanaidu.naladala@intel.com>
Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
---
 lib/igt_psr.c | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/lib/igt_psr.c b/lib/igt_psr.c index 09107cd5b..4e44f44e6 100644
--- a/lib/igt_psr.c
+++ b/lib/igt_psr.c
@@ -114,28 +114,12 @@ 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)  {
-	/*
-	 * 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);
+	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)  {
-	/*
-	 * 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);
+	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