Mesa (main): amd: add SDMA_NOP_PAD

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 148b2d0040a0284c0d21531fb482ca56a0f85f89
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=148b2d0040a0284c0d21531fb482ca56a0f85f89

Author: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
Date:   Thu Jan  6 14:38:24 2022 +0100

amd: add SDMA_NOP_PAD

And use it in amdgpu_cs.c.

Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13959>

---

 src/amd/common/sid.h                      | 2 ++
 src/gallium/winsys/amdgpu/drm/amdgpu_cs.c | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/amd/common/sid.h b/src/amd/common/sid.h
index 9d44d3cdbed..4a85b4666cc 100644
--- a/src/amd/common/sid.h
+++ b/src/amd/common/sid.h
@@ -327,6 +327,8 @@
 #define CIK_SDMA_COPY_MAX_SIZE    0x3fff00   /* almost 4 MB*/
 #define GFX103_SDMA_COPY_MAX_SIZE 0x3fffff00 /* almost 1 GB */
 
+#define SDMA_NOP_PAD CIK_SDMA_PACKET(CIK_SDMA_OPCODE_NOP, 0, 0) /* header-only version */
+
 enum amd_cmp_class_flags
 {
    S_NAN = 1 << 0,       // Signaling NaN
diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c b/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c
index 4a658da9df6..fc2340a0680 100644
--- a/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c
+++ b/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c
@@ -1665,7 +1665,7 @@ static int amdgpu_cs_flush(struct radeon_cmdbuf *rcs,
             radeon_emit(rcs, 0xf0000000); /* NOP packet */
       } else {
          while (rcs->current.cdw & ib_pad_dw_mask)
-            radeon_emit(rcs, 0x00000000); /* NOP packet */
+            radeon_emit(rcs, SDMA_NOP_PAD);
       }
       break;
    case RING_GFX: