Revert "lib/igt_psr: Remove SRD status change check for DP2.1 Panel Replay"
PATCH 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
--- lib/igt_psr.c | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-)
lib/igt_psr.c +2 -18
@@ -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)
Signature · 1 line
2.43.0
PATCH 2/2 Revert "lib/igt_psr: Fix PR state check for DisplayPort connectors"
Causing regression in CI BAT.
This reverts commit 196c2cc9c945a66bb542fdefcf491ea62c1f885e.
Issue: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/2748
--- lib/igt_psr.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
lib/igt_psr.c +2 -3
@@ -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" ;
Signature · 1 line
2.43.0
Re: [i-g-t 2/2] Revert "lib/igt_psr: Fix PR state check for DisplayPort connectors"
Quoted 27 lines · Bhanuprakash Modem
Causing regression in CI BAT.
This reverts commit
196c2cc9c945a66bb542fdefcf491ea62c1f885e.Issue: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/2748
Cc Naladala Ramanaidu <[email protected]>Signed-off-by Bhanuprakash Modem <[email protected]>--- lib/igt_psr.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)lib/igt_psr.c +2
-3@@ -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" ;
-----Original Message-----
From: Modem, Bhanuprakash <[email protected]>
Sent: Wednesday, September 11, 2024 1:28 PM
To: [email protected]
Cc: Modem, Bhanuprakash <[email protected]>; Naladala, Ramanaidu <[email protected]>
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
--- lib/igt_psr.c | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-)
lib/igt_psr.c +2 -19
@@ -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