From: Prike Liang <Prike.Liang@amd.com>
To: <igt-dev@lists.freedesktop.org>
Cc: <Vitaly.Prosyak@amd.com>, <Jesse.Zhang@amd.com>,
<Alexander.Deucher@amd.com>, Prike Liang <Prike.Liang@amd.com>
Subject: [PATCH] tests/amdgpu: update bad length case
Date: Thu, 1 Aug 2024 17:55:40 +0800 [thread overview]
Message-ID: <20240801095540.2517506-1-Prike.Liang@amd.com> (raw)
In the bad length case, when the header length has more than 4dwords than
packet stream length then CPFW will pending on the stream data and raise a
CP halt error which requires do the pipe reset. As to the orignal case
of header length is smaller than PM4 stream length then the PM4 stream
data may will create a bad opcode error which only requires the queue
reset. So for testing the pipe reset need to update the header length
bigger than the PM4 stream data length.
Signed-off-by: Prike Liang <Prike.Liang@amd.com>
---
lib/amdgpu/amd_ip_blocks.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/lib/amdgpu/amd_ip_blocks.c b/lib/amdgpu/amd_ip_blocks.c
index f675b97dd..503b68431 100644
--- a/lib/amdgpu/amd_ip_blocks.c
+++ b/lib/amdgpu/amd_ip_blocks.c
@@ -189,7 +189,7 @@ gfx_ring_bad_write_linear(const struct amdgpu_ip_funcs *func,
const struct amdgpu_ring_context *ring_context,
uint32_t *pm4_dw, unsigned int cmd_error)
{
- uint32_t i, j;
+ uint32_t i, j, stream_length;
i = 0;
j = 0;
@@ -198,6 +198,11 @@ gfx_ring_bad_write_linear(const struct amdgpu_ip_funcs *func,
* But the range applies to all asics.
* 0xcb-0xcf, 0xd2-0xef, 0xf1-0xfb
*/
+ if (cmd_error == CMD_STREAM_EXEC_INVALID_OPCODE)
+ stream_length = ring_context->write_length / 16;
+ else
+ stream_length = ring_context->write_length;
+
if (cmd_error == CMD_STREAM_EXEC_INVALID_OPCODE)
ring_context->pm4[i++] = PACKET3(0xf2, 2 + ring_context->write_length);
else if (cmd_error == CMD_STREAM_EXEC_INVALID_PACKET_LENGTH)
@@ -223,7 +228,7 @@ gfx_ring_bad_write_linear(const struct amdgpu_ip_funcs *func,
ring_context->pm4[i++] = upper_32_bits(ring_context->bo_mc);
}
- while (j++ < ring_context->write_length)
+ while (j++ < stream_length)
ring_context->pm4[i++] = func->deadbeaf;
*pm4_dw = i;
return i;
--
2.34.1
next reply other threads:[~2024-08-01 10:10 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-01 9:55 Prike Liang [this message]
2024-08-01 10:33 ` [PATCH] tests/amdgpu: update bad length case Zhang, Jesse(Jie)
2024-08-01 10:47 ` Zhang, Jesse(Jie)
2024-08-01 10:56 ` Liang, Prike
2024-08-01 10:59 ` Zhang, Jesse(Jie)
-- strict thread matches above, loose matches on Subject: below --
2024-08-01 10:59 Prike Liang
2024-08-07 1:06 ` Liang, Prike
2024-08-07 1:16 ` vitaly prosyak
2024-08-01 8:25 Prike Liang
2024-08-01 8:29 ` Zhang, Jesse(Jie)
2024-08-01 9:51 ` Liang, Prike
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=20240801095540.2517506-1-Prike.Liang@amd.com \
--to=prike.liang@amd.com \
--cc=Alexander.Deucher@amd.com \
--cc=Jesse.Zhang@amd.com \
--cc=Vitaly.Prosyak@amd.com \
--cc=igt-dev@lists.freedesktop.org \
/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