drm/amdgpu/sdma4: set align mask to 255
Subsystems (2)
Alex Deucher
maintainerPATCH 1/1 drm/amdgpu/sdma4: set align mask to 255
The wptr needs to be incremented at at least 64 dword intervals, use 256 to align with windows. This should fix potential hangs with unaligned updates.
--- drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 4 ++-- drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +2 -2
@@ -2312,7 +2312,7 @@ const struct amd_ip_funcs sdma_v4_0_ip_funcs = {static const struct amdgpu_ring_funcs sdma_v4_0_ring_funcs = { .type =AMDGPU_RING_TYPE_SDMA , - .align_mask =0xf , + .align_mask =0xff , .nop =SDMA_PKT_NOP_HEADER_OP (SDMA_OP_NOP ), .support_64bit_ptrs = true, .secure_submission_supported = true,
@@ -2344,7 +2344,7 @@ static const struct amdgpu_ring_funcs sdma_v4_0_ring_funcs = {static const struct amdgpu_ring_funcs sdma_v4_0_page_ring_funcs = { .type =AMDGPU_RING_TYPE_SDMA , - .align_mask =0xf , + .align_mask =0xff , .nop =SDMA_PKT_NOP_HEADER_OP (SDMA_OP_NOP ), .support_64bit_ptrs = true, .secure_submission_supported = true,
drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c +2 -2
@@ -1823,7 +1823,7 @@ const struct amd_ip_funcs sdma_v4_4_2_ip_funcs = {static const struct amdgpu_ring_funcs sdma_v4_4_2_ring_funcs = { .type =AMDGPU_RING_TYPE_SDMA , - .align_mask =0xf , + .align_mask =0xff , .nop =SDMA_PKT_NOP_HEADER_OP (SDMA_OP_NOP ), .support_64bit_ptrs = true, .get_rptr = sdma_v4_4_2_ring_get_rptr,
@@ -1854,7 +1854,7 @@ static const struct amdgpu_ring_funcs sdma_v4_4_2_ring_funcs = {static const struct amdgpu_ring_funcs sdma_v4_4_2_page_ring_funcs = { .type =AMDGPU_RING_TYPE_SDMA , - .align_mask =0xf , + .align_mask =0xff , .nop =SDMA_PKT_NOP_HEADER_OP (SDMA_OP_NOP ), .support_64bit_ptrs = true, .get_rptr = sdma_v4_4_2_ring_get_rptr,
Signature · 1 line
2.40.1
ping?
Quoted 58 lines · Alex Deucher
The wptr needs to be incremented at at least 64 dword intervals, use 256 to align with windows. This should fix potential hangs with unaligned updates.
Signed-off-by Alex Deucher <[email protected]>--- drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 4 ++-- drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +2
-2@@ -2312,7 +2312,7 @@ const struct amd_ip_funcs sdma_v4_0_ip_funcs = {static const struct amdgpu_ring_funcs sdma_v4_0_ring_funcs = { .type =AMDGPU_RING_TYPE_SDMA , - .align_mask =0xf , + .align_mask =0xff , .nop =SDMA_PKT_NOP_HEADER_OP (SDMA_OP_NOP ), .support_64bit_ptrs = true, .secure_submission_supported = true,@@ -2344,7 +2344,7 @@ static const struct amdgpu_ring_funcs sdma_v4_0_ring_funcs = {static const struct amdgpu_ring_funcs sdma_v4_0_page_ring_funcs = { .type =AMDGPU_RING_TYPE_SDMA , - .align_mask =0xf , + .align_mask =0xff , .nop =SDMA_PKT_NOP_HEADER_OP (SDMA_OP_NOP ), .support_64bit_ptrs = true, .secure_submission_supported = true,drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c +2
-3@@ -1823,7 +1823,7 @@ const struct amd_ip_funcs sdma_v4_4_2_ip_funcs = {static const struct amdgpu_ring_funcs sdma_v4_4_2_ring_funcs = { .type =AMDGPU_RING_TYPE_SDMA , - .align_mask =0xf , + .align_mask =0xff , .nop =SDMA_PKT_NOP_HEADER_OP (SDMA_OP_NOP ), .support_64bit_ptrs = true, .get_rptr = sdma_v4_4_2_ring_get_rptr,@@ -1854,7 +1854,7 @@ static const struct amdgpu_ring_funcs sdma_v4_4_2_ring_funcs = {static const struct amdgpu_ring_funcs sdma_v4_4_2_page_ring_funcs = { .type =AMDGPU_RING_TYPE_SDMA , - .align_mask =0xf , + .align_mask =0xff , .nop =SDMA_PKT_NOP_HEADER_OP (SDMA_OP_NOP ), .support_64bit_ptrs = true, .get_rptr = sdma_v4_4_2_ring_get_rptr, --2.40.1
Liu, Aaron
Reviewed-by[AMD Official Use Only - General]
Quoted 73 lines
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Alex Deucher
Sent: Tuesday, June 13, 2023 5:48 AM
To: Deucher, Alexander <[email protected]>
Cc: [email protected]
Subject: Re: [PATCH] drm/amdgpu/sdma4: set align mask to 255ping?
Quoted 61 lines · Alex Deucher
The wptr needs to be incremented at at least 64 dword intervals, use 256 to align with windows. This should fix potential hangs with unaligned updates.
Signed-off-by Alex Deucher <[email protected]>--- drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 4 ++-- drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +1
-1@@ -2312,7 +2312,7 @@ const struct amd_ip_funcs sdma_v4_0_ip_funcs = {static const struct amdgpu_ring_funcs sdma_v4_0_ring_funcs = { .type =AMDGPU_RING_TYPE_SDMA , - .align_mask =0xf , + .align_mask =0xff , .nop =SDMA_PKT_NOP_HEADER_OP (SDMA_OP_NOP ), .support_64bit_ptrs = true, .secure_submission_supported = true, @@ -2344,7 +2344,7 @@static const struct
amdgpu_ring_funcssdma_v4_0_ring_funcs= {static const struct
amdgpu_ring_funcssdma_v4_0_page_ring_funcs= {
.type =AMDGPU_RING_TYPE_SDMA,drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +1
-1- .align_mask = 0xf, + .align_mask = 0xff, .nop = SDMA_PKT_NOP_HEADER_OP(SDMA_OP_NOP), .support_64bit_ptrs = true, .secure_submission_supported = true, diff --git
a/drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.cb/drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c
index8eebf9c2bbcd..05bb0691ee0e100644drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c +1
-1@@ -1823,7 +1823,7 @@ const struct amd_ip_funcs sdma_v4_4_2_ip_funcs = {static const struct amdgpu_ring_funcs sdma_v4_4_2_ring_funcs = { .type =AMDGPU_RING_TYPE_SDMA , - .align_mask =0xf , + .align_mask =0xff , .nop =SDMA_PKT_NOP_HEADER_OP (SDMA_OP_NOP ), .support_64bit_ptrs = true,.get_rptr = sdma_v4_4_2_ring_get_rptr, @@ -1854,7 +1854,7 @@static const struct
amdgpu_ring_funcssdma_v4_4_2_ring_funcs= {static const struct
amdgpu_ring_funcssdma_v4_4_2_page_ring_funcs= {
.type =AMDGPU_RING_TYPE_SDMA,drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c +1
-2- .align_mask = 0xf, + .align_mask = 0xff, .nop = SDMA_PKT_NOP_HEADER_OP(SDMA_OP_NOP), .support_64bit_ptrs = true, .get_rptr = sdma_v4_4_2_ring_get_rptr, --2.40.1
Christian König
Reviewed-byAm 13.06.23 um 03:14 schrieb Liu, Aaron:
Quoted 76 lines
[AMD Official Use Only - General]
Reviewed-by Aaron Liu <[email protected]>Quoted 72 lines
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Alex Deucher
Sent: Tuesday, June 13, 2023 5:48 AM
To: Deucher, Alexander <[email protected]>
Cc: [email protected]
Subject: Re: [PATCH] drm/amdgpu/sdma4: set align mask to 255ping?
Quoted 60 lines · Alex Deucher
The wptr needs to be incremented at at least 64 dword intervals, use 256 to align with windows. This should fix potential hangs with unaligned updates.
Signed-off-by Alex Deucher <[email protected]>--- drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 4 ++-- drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +1
-1@@ -2312,7 +2312,7 @@ const struct amd_ip_funcs sdma_v4_0_ip_funcs = {static const struct amdgpu_ring_funcs sdma_v4_0_ring_funcs = { .type =AMDGPU_RING_TYPE_SDMA , - .align_mask =0xf , + .align_mask =0xff , .nop =SDMA_PKT_NOP_HEADER_OP (SDMA_OP_NOP ), .support_64bit_ptrs = true, .secure_submission_supported = true, @@ -2344,7 +2344,7 @@static const struct
amdgpu_ring_funcssdma_v4_0_ring_funcs= {static const struct amdgpu_ring_funcs sdma_v4_0_page_ring_funcs = { .type = AMDGPU_RING_TYPE_SDMA,drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +1
-1- .align_mask = 0xf, + .align_mask = 0xff, .nop = SDMA_PKT_NOP_HEADER_OP(SDMA_OP_NOP), .support_64bit_ptrs = true, .secure_submission_supported = true, diff --git
a/drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.cb/drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c
index8eebf9c2bbcd..05bb0691ee0e100644drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c +1
-1@@ -1823,7 +1823,7 @@ const struct amd_ip_funcs sdma_v4_4_2_ip_funcs = {static const struct amdgpu_ring_funcs sdma_v4_4_2_ring_funcs = { .type =AMDGPU_RING_TYPE_SDMA , - .align_mask =0xf , + .align_mask =0xff , .nop =SDMA_PKT_NOP_HEADER_OP (SDMA_OP_NOP ), .support_64bit_ptrs = true,.get_rptr = sdma_v4_4_2_ring_get_rptr, @@ -1854,7 +1854,7 @@static const struct
amdgpu_ring_funcssdma_v4_4_2_ring_funcs= {static const struct amdgpu_ring_funcs sdma_v4_4_2_page_ring_funcs = { .type = AMDGPU_RING_TYPE_SDMA,drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c +1
-2- .align_mask = 0xf, + .align_mask = 0xff, .nop = SDMA_PKT_NOP_HEADER_OP(SDMA_OP_NOP), .support_64bit_ptrs = true, .get_rptr = sdma_v4_4_2_ring_get_rptr, --2.40.1
Am 2023-06-07 um 12:31 schrieb Alex Deucher:
Quoted 5 lines
The wptr needs to be incremented at at least 64 dword intervals, use 256 to align with windows. This should fix potential hangs with unaligned updates.
Signed-off-by Alex Deucher <[email protected]>
Quoted 49 lines
--- drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 4 ++-- drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +2
-2@@ -2312,7 +2312,7 @@ const struct amd_ip_funcs sdma_v4_0_ip_funcs = {static const struct amdgpu_ring_funcs sdma_v4_0_ring_funcs = { .type =AMDGPU_RING_TYPE_SDMA , - .align_mask =0xf , + .align_mask =0xff , .nop =SDMA_PKT_NOP_HEADER_OP (SDMA_OP_NOP ), .support_64bit_ptrs = true, .secure_submission_supported = true,@@ -2344,7 +2344,7 @@ static const struct amdgpu_ring_funcs sdma_v4_0_ring_funcs = {static const struct amdgpu_ring_funcs sdma_v4_0_page_ring_funcs = { .type =AMDGPU_RING_TYPE_SDMA , - .align_mask =0xf , + .align_mask =0xff , .nop =SDMA_PKT_NOP_HEADER_OP (SDMA_OP_NOP ), .support_64bit_ptrs = true, .secure_submission_supported = true,drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c +2
-2@@ -1823,7 +1823,7 @@ const struct amd_ip_funcs sdma_v4_4_2_ip_funcs = {static const struct amdgpu_ring_funcs sdma_v4_4_2_ring_funcs = { .type =AMDGPU_RING_TYPE_SDMA , - .align_mask =0xf , + .align_mask =0xff , .nop =SDMA_PKT_NOP_HEADER_OP (SDMA_OP_NOP ), .support_64bit_ptrs = true, .get_rptr = sdma_v4_4_2_ring_get_rptr,@@ -1854,7 +1854,7 @@ static const struct amdgpu_ring_funcs sdma_v4_4_2_ring_funcs = {static const struct amdgpu_ring_funcs sdma_v4_4_2_page_ring_funcs = { .type =AMDGPU_RING_TYPE_SDMA , - .align_mask =0xf , + .align_mask =0xff , .nop =SDMA_PKT_NOP_HEADER_OP (SDMA_OP_NOP ), .support_64bit_ptrs = true, .get_rptr = sdma_v4_4_2_ring_get_rptr,