On 2026-09-22 09:54, Alex Deucher wrote:
From: Likun Gao<[email protected]>

Add support for LSDMA v8

Signed-off-by: Likun Gao<[email protected]>
Reviewed-by: Frank Min<[email protected]>
Signed-off-by: Alex Deucher<[email protected]>
---
  drivers/gpu/drm/amd/amdgpu/Makefile           |   2 +-
  drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c |   4 +
  drivers/gpu/drm/amd/amdgpu/lsdma_v8_0.c       | 113 ++++++++++++++++++
  drivers/gpu/drm/amd/amdgpu/lsdma_v8_0.h       |  31 +++++
  4 files changed, 149 insertions(+), 1 deletion(-)
  create mode 100644 drivers/gpu/drm/amd/amdgpu/lsdma_v8_0.c
  create mode 100644 drivers/gpu/drm/amd/amdgpu/lsdma_v8_0.h

diff --git a/drivers/gpu/drm/amd/amdgpu/Makefile 
b/drivers/gpu/drm/amd/amdgpu/Makefile
index 2ea1924571039..83e40f26ddf5f 100644
--- a/drivers/gpu/drm/amd/amdgpu/Makefile
+++ b/drivers/gpu/drm/amd/amdgpu/Makefile
@@ -92,7 +92,7 @@ amdgpu-y += \
        sienna_cichlid.o smu_v13_0_10.o nbio_v4_3.o hdp_v6_0.o nbio_v7_7.o 
hdp_v5_2.o lsdma_v6_0.o \
        nbio_v7_9.o aqua_vanjaram.o nbio_v7_11.o lsdma_v7_0.o hdp_v7_0.o 
nbif_v6_3_1.o \
        cyan_skillfish_reg_init.o soc_v1_0.o lsdma_v7_1.o nbio_v6_3_2.o 
nbio_v7_11_5.o \
-       nbif_v7_10.o hdp_v8_0.o
+       nbif_v7_10.o hdp_v8_0.o lsdma_v8_0.o
# add DF block
  amdgpu-y += \
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
index 564f09c308816..202e0b80e5225 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
@@ -95,6 +95,7 @@
  #include "lsdma_v6_0.h"
  #include "lsdma_v7_0.h"
  #include "lsdma_v7_1.h"
+#include "lsdma_v8_0.h"
  #include "vcn_v2_0.h"
  #include "jpeg_v2_0.h"
  #include "vcn_v3_0.h"
@@ -3979,6 +3980,9 @@ int amdgpu_discovery_set_ip_blocks(struct amdgpu_device 
*adev)
        case IP_VERSION(7, 1, 0):
                adev->lsdma.funcs = &lsdma_v7_1_funcs;
                break;
+       case IP_VERSION(8, 0, 0):
+               adev->lsdma.funcs = &lsdma_v8_0_funcs;
+               break;
        default:
                break;
        }
diff --git a/drivers/gpu/drm/amd/amdgpu/lsdma_v8_0.c 
b/drivers/gpu/drm/amd/amdgpu/lsdma_v8_0.c
new file mode 100644
index 0000000000000..f1dd02a56810b
--- /dev/null
+++ b/drivers/gpu/drm/amd/amdgpu/lsdma_v8_0.c
@@ -0,0 +1,113 @@
+/*
+ * Copyright 2026 Advanced Micro Devices, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+#include <linux/delay.h>
+#include "amdgpu.h"
+#include "lsdma_v8_0.h"
+#include "amdgpu_lsdma.h"
+
+#include "lsdma/lsdma_8_0_1_offset.h"
+#include "lsdma/lsdma_8_0_1_sh_mask.h"
+
+static int lsdma_v8_0_wait_pio_status(struct amdgpu_device *adev)
+{
+       return amdgpu_lsdma_wait_for(adev, SOC15_REG_OFFSET(LSDMA, 0, 
regLSDMA_PIO_STATUS),
+                       LSDMA_PIO_STATUS__PIO_IDLE_MASK | 
LSDMA_PIO_STATUS__PIO_FIFO_EMPTY_MASK,
+                       LSDMA_PIO_STATUS__PIO_IDLE_MASK | 
LSDMA_PIO_STATUS__PIO_FIFO_EMPTY_MASK);
See lsdma_v7_1_wait_pio_status() as a reference: please check the LSDMA command error status instead of returning success with a silent error, and write 1 to clear the error status bit so LSDMA recovers for the next command.

Regards,
Philip
+}
+
+static int lsdma_v8_0_copy_mem(struct amdgpu_device *adev,
+                              uint64_t src_addr,
+                              uint64_t dst_addr,
+                              uint64_t size)
+{
+       int ret;
+       uint32_t tmp;
+
+       WREG32_SOC15(LSDMA, 0, regLSDMA_PIO_SRC_ADDR_LO, 
lower_32_bits(src_addr));
+       WREG32_SOC15(LSDMA, 0, regLSDMA_PIO_SRC_ADDR_HI, 
upper_32_bits(src_addr));
+
+       WREG32_SOC15(LSDMA, 0, regLSDMA_PIO_DST_ADDR_LO, 
lower_32_bits(dst_addr));
+       WREG32_SOC15(LSDMA, 0, regLSDMA_PIO_DST_ADDR_HI, 
upper_32_bits(dst_addr));
+
+       WREG32_SOC15(LSDMA, 0, regLSDMA_PIO_CONTROL, 0x0);
+
+       tmp = RREG32_SOC15(LSDMA, 0, regLSDMA_PIO_CMDPARAM);
+       tmp = REG_SET_FIELD(tmp, LSDMA_PIO_CMDPARAM, CMD_TYPE, 0);
+       WREG32_SOC15(LSDMA, 0, regLSDMA_PIO_CMDPARAM, tmp);
+
+       tmp = RREG32_SOC15(LSDMA, 0, regLSDMA_PIO_COMMAND);
+       tmp = REG_SET_FIELD(tmp, LSDMA_PIO_COMMAND, BYTE_COUNT, size);
+       tmp = REG_SET_FIELD(tmp, LSDMA_PIO_COMMAND, SRC_LOCATION, 0);
+       tmp = REG_SET_FIELD(tmp, LSDMA_PIO_COMMAND, DST_LOCATION, 0);
+       tmp = REG_SET_FIELD(tmp, LSDMA_PIO_COMMAND, SRC_ADDR_INC, 0);
+       tmp = REG_SET_FIELD(tmp, LSDMA_PIO_COMMAND, DST_ADDR_INC, 0);
+       tmp = REG_SET_FIELD(tmp, LSDMA_PIO_COMMAND, OVERLAP_DISABLE, 0);
+       WREG32_SOC15(LSDMA, 0, regLSDMA_PIO_COMMAND, tmp);
+
+       ret = lsdma_v8_0_wait_pio_status(adev);
+       if (ret)
+               dev_err(adev->dev, "LSDMA PIO failed to copy memory!\n");
+
+       return ret;
+}
+
+static int lsdma_v8_0_fill_mem(struct amdgpu_device *adev,
+                              uint64_t dst_addr,
+                              uint32_t data,
+                              uint64_t size)
+{
+       int ret;
+       uint32_t tmp;
+
+       WREG32_SOC15(LSDMA, 0, regLSDMA_PIO_CONSTFILL_DATA, data);
+
+       WREG32_SOC15(LSDMA, 0, regLSDMA_PIO_DST_ADDR_LO, 
lower_32_bits(dst_addr));
+       WREG32_SOC15(LSDMA, 0, regLSDMA_PIO_DST_ADDR_HI, 
upper_32_bits(dst_addr));
+
+       WREG32_SOC15(LSDMA, 0, regLSDMA_PIO_CONTROL, 0x0);
+
+       tmp = RREG32_SOC15(LSDMA, 0, regLSDMA_PIO_CMDPARAM);
+       tmp = REG_SET_FIELD(tmp, LSDMA_PIO_CMDPARAM, CMD_TYPE, 1);
+       WREG32_SOC15(LSDMA, 0, regLSDMA_PIO_CMDPARAM, tmp);
+
+       tmp = RREG32_SOC15(LSDMA, 0, regLSDMA_PIO_COMMAND);
+       tmp = REG_SET_FIELD(tmp, LSDMA_PIO_COMMAND, BYTE_COUNT, size);
+       tmp = REG_SET_FIELD(tmp, LSDMA_PIO_COMMAND, SRC_LOCATION, 0);
+       tmp = REG_SET_FIELD(tmp, LSDMA_PIO_COMMAND, DST_LOCATION, 0);
+       tmp = REG_SET_FIELD(tmp, LSDMA_PIO_COMMAND, SRC_ADDR_INC, 0);
+       tmp = REG_SET_FIELD(tmp, LSDMA_PIO_COMMAND, DST_ADDR_INC, 0);
+       tmp = REG_SET_FIELD(tmp, LSDMA_PIO_COMMAND, OVERLAP_DISABLE, 0);
+       WREG32_SOC15(LSDMA, 0, regLSDMA_PIO_COMMAND, tmp);
+
+       ret = lsdma_v8_0_wait_pio_status(adev);
+       if (ret)
+               dev_err(adev->dev, "LSDMA PIO failed to fill memory!\n");
+
+       return ret;
+}
+
+const struct amdgpu_lsdma_funcs lsdma_v8_0_funcs = {
+       .copy_mem = lsdma_v8_0_copy_mem,
+       .fill_mem = lsdma_v8_0_fill_mem,
+};
diff --git a/drivers/gpu/drm/amd/amdgpu/lsdma_v8_0.h 
b/drivers/gpu/drm/amd/amdgpu/lsdma_v8_0.h
new file mode 100644
index 0000000000000..648d5cc85c48e
--- /dev/null
+++ b/drivers/gpu/drm/amd/amdgpu/lsdma_v8_0.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2026 Advanced Micro Devices, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+#ifndef __LSDMA_V8_0_H__
+#define __LSDMA_V8_0_H__
+
+#include "soc15_common.h"
+
+extern const struct amdgpu_lsdma_funcs lsdma_v8_0_funcs;
+
+#endif /* __LSDMA_V8_0_H__ */

Reply via email to