From: Hersen Wu <hersenxs.wu@amd.com>
To: igt-dev@lists.freedesktop.org, rodrigo.siqueira@amd.com,
aurabindo.pillai@amd.com, alex.hung@amd.com,
hamza.mahfooz@amd.com, wayne.lin@amd.com
Cc: Hersen Wu <hersenxs.wu@amd.com>, markyacoub@google.com
Subject: [PATCH 2/3] [i-g-t] tests/amdgpu/amd_bypass: Fix psr edp r/x crc read timeout
Date: Wed, 17 Jan 2024 21:36:07 -0500 [thread overview]
Message-ID: <20240118023608.55865-2-hersenxs.wu@amd.com> (raw)
In-Reply-To: <20240118023608.55865-1-hersenxs.wu@amd.com>
With debugfs disallow_edp_enter_psr, disable edp psr before
tx read rx crc.
dpms off, tx write dpcd 0x600=2. this will let dpcd 0x170=0.
rx psr and crc check for rx internal logic are disabled.
with disallow_edp_enter_psr, when dpms on, kernel driver will
light up edp with dpcd 0x170=0. then tx read rx crc successfully.
Signed-off-by: Hersen Wu <hersenxs.wu@amd.com>
---
tests/amdgpu/amd_bypass.c | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/tests/amdgpu/amd_bypass.c b/tests/amdgpu/amd_bypass.c
index d192a30ea..d82e22ded 100644
--- a/tests/amdgpu/amd_bypass.c
+++ b/tests/amdgpu/amd_bypass.c
@@ -72,6 +72,24 @@ static void test_init(data_t *data)
data->output = igt_get_single_output_for_pipe(display, data->pipe_id);
igt_assert(data->output);
+ if (data->output->config.connector->connector_type == DRM_MODE_CONNECTOR_eDP) {
+ kmstest_set_connector_dpms(data->output->display->drm_fd,
+ data->output->config.connector, DRM_MODE_DPMS_OFF);
+
+ /* with dmps off, tx write dpcd 0x600=2 to rx. edp rx
+ * exit psr state and stop verify crc from main link.
+ * with disabllow edp enter psr within kernel, when run
+ * dmps on to turn on display, kernel tx will not notify
+ * rx psr enable and crc checking by rx. by this, when tx
+ * want to read crc from rx, rx will check crc and response
+ * right away. timeout will not happens.
+ */
+ igt_amd_disallow_edp_enter_psr(data->drm_fd, data->output->name, true);
+
+ kmstest_set_connector_dpms(data->output->display->drm_fd,
+ data->output->config.connector, DRM_MODE_DPMS_ON);
+ }
+
data->mode = igt_output_get_mode(data->output);
igt_assert(data->mode);
@@ -370,6 +388,11 @@ static void bypass_8bpc_test(data_t *data)
igt_plane_set_fb(data->primary, NULL);
test_fini(data);
igt_remove_fb(data->drm_fd, &fb);
+
+ if (data->output->config.connector->connector_type == DRM_MODE_CONNECTOR_eDP) {
+ /* restore allow kernel driver eDP PSR */
+ igt_amd_disallow_edp_enter_psr(data->drm_fd, data->output->name, false);
+ }
}
igt_main
--
2.25.1
next prev parent reply other threads:[~2024-01-18 2:36 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-18 2:36 [PATCH 1/3] [i-g-t] lib/igt_amd: add debugfs disallow edp enter psr Hersen Wu
2024-01-18 2:36 ` Hersen Wu [this message]
2024-01-18 2:36 ` [PATCH 3/3] [i-g-t] tests/amdgpu/amd_ilr: Fix psr edp rx crc read timeout Hersen Wu
2024-01-18 10:16 ` Lin, Wayne
2024-01-18 3:20 ` ✓ CI.xeBAT: success for series starting with [1/3,i-g-t] lib/igt_amd: add debugfs disallow edp enter psr Patchwork
2024-01-18 3:34 ` ✓ Fi.CI.BAT: " Patchwork
2024-01-18 5:21 ` ✗ Fi.CI.IGT: failure " Patchwork
-- strict thread matches above, loose matches on Subject: below --
2024-01-18 13:14 [PATCH 1/3] [i-g-t] " Hersen Wu
2024-01-18 13:14 ` [PATCH 2/3] [i-g-t] tests/amdgpu/amd_bypass: Fix psr edp r/x crc read timeout Hersen Wu
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=20240118023608.55865-2-hersenxs.wu@amd.com \
--to=hersenxs.wu@amd.com \
--cc=alex.hung@amd.com \
--cc=aurabindo.pillai@amd.com \
--cc=hamza.mahfooz@amd.com \
--cc=igt-dev@lists.freedesktop.org \
--cc=markyacoub@google.com \
--cc=rodrigo.siqueira@amd.com \
--cc=wayne.lin@amd.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