Skip to contentSkip to conversation

drm/amdgpu: add psp funcs for ring write pointer read/write

PATCH In review Hawking Zhang 3 participants 5 messages Nov 18, 2019 2 messages not in the archive

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/3 drm/amdgpu: add psp funcs for ring write pointer read/write

The ring write pointer regsiter update is the only part that is IP specific ones in psp_cmd_submit function.

Add two callbacks for wptr read/write so that we unify the psp_cmd_submit function for all the ASICs.

Change-Id Idd0b70bd8682f8bd2f9b92098d6ce55fa4cee310
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h |  5 +++++
 drivers/gpu/drm/amd/amdgpu/psp_v10_0.c  | 16 +++++++++++++++
 drivers/gpu/drm/amd/amdgpu/psp_v11_0.c  | 26 ++++++++++++++++++++++++
 drivers/gpu/drm/amd/amdgpu/psp_v12_0.c  | 26 ++++++++++++++++++++++++
 drivers/gpu/drm/amd/amdgpu/psp_v3_1.c   | 27 +++++++++++++++++++++++++
 5 files changed, 100 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h +5 -0
index 09c5474ebcc3..d5620c46f3fc 100644
@@ -116,6 +116,8 @@ struct psp_funcs
 	int (*mem_training_init)(struct psp_context *psp);
 	void (*mem_training_fini)(struct psp_context *psp);
 	int (*mem_training)(struct psp_context *psp, uint32_t ops);
+	uint32_t (*ring_get_wptr)(struct psp_context *psp);
+	void (*ring_set_wptr)(struct psp_context *psp, uint32_t value);
 };
 
 #define AMDGPU_XGMI_MAX_CONNECTED_NODES		64
@@ -346,6 +348,9 @@ struct amdgpu_psp_funcs {
 	((psp)->funcs->ras_cure_posion ? \
 	(psp)->funcs->ras_cure_posion(psp, (addr)) : -EINVAL)
 
+#define psp_ring_get_wptr(psp) (psp)->funcs->ring_get_wptr((psp))
+#define psp_ring_set_wptr(psp, value) (psp)->funcs->ring_set_wptr((psp), (value))
+
 extern const struct amd_ip_funcs psp_ip_funcs;
 
 extern const struct amdgpu_ip_block_version psp_v3_1_ip_block;
drivers/gpu/drm/amd/amdgpu/psp_v10_0.c +16 -0
index ed8beff02e62..b8a461d46cb5 100644
@@ -404,6 +404,20 @@ static int psp_v10_0_mode1_reset(struct psp_context *psp)
 	return -EINVAL;
 }
 
+static uint32_t psp_v10_0_ring_get_wptr(struct psp_context *psp)
+{
+	struct amdgpu_device *adev = psp->adev;
+
+	return RREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_67);
+}
+
+static void psp_v10_0_ring_set_wptr(struct psp_context *psp, uint32_t value)
+{
+	struct amdgpu_device *adev = psp->adev;
+
+	WREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_67, value);
+}
+
 static const struct psp_funcs psp_v10_0_funcs = {
 	.init_microcode = psp_v10_0_init_microcode,
 	.ring_init = psp_v10_0_ring_init,
@@ -413,6 +427,8 @@ static const struct psp_funcs psp_v10_0_funcs = {
 	.cmd_submit = psp_v10_0_cmd_submit,
 	.compare_sram_data = psp_v10_0_compare_sram_data,
 	.mode1_reset = psp_v10_0_mode1_reset,
+	.ring_get_wptr = psp_v10_0_ring_get_wptr,
+	.ring_set_wptr = psp_v10_0_ring_set_wptr,
 };
 
 void psp_v10_0_set_psp_funcs(struct psp_context *psp)
drivers/gpu/drm/amd/amdgpu/psp_v11_0.c +26 -0
index ebd96c3c58b9..79fa2c655857 100644
@@ -1066,6 +1066,30 @@ static int psp_v11_0_memory_training(struct psp_context *psp, uint32_t ops)
 	return 0;
 }
 
+static uint32_t psp_v11_0_ring_get_wptr(struct psp_context *psp)
+{
+	uint32_t data;
+	struct amdgpu_device *adev = psp->adev;
+
+	if (psp_v11_0_support_vmr_ring(psp))
+		data = RREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_102);
+	else
+		data = RREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_67);
+
+	return data;
+}
+
+static void psp_v11_0_ring_set_wptr(struct psp_context *psp, uint32_t value)
+{
+	struct amdgpu_device *adev = psp->adev;
+
+	if (psp_v11_0_support_vmr_ring(psp)) {
+		WREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_102, value);
+		WREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_101, GFX_CTRL_CMD_ID_CONSUME_CMD);
+	} else
+		WREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_67, value);
+}
+
 static const struct psp_funcs psp_v11_0_funcs = {
 	.init_microcode = psp_v11_0_init_microcode,
 	.bootloader_load_kdb = psp_v11_0_bootloader_load_kdb,
@@ -1089,6 +1113,8 @@ static const struct psp_funcs psp_v11_0_funcs = {
 	.mem_training_init = psp_v11_0_memory_training_init,
 	.mem_training_fini = psp_v11_0_memory_training_fini,
 	.mem_training = psp_v11_0_memory_training,
+	.ring_get_wptr = psp_v11_0_ring_get_wptr,
+	.ring_set_wptr = psp_v11_0_ring_set_wptr,
 };
 
 void psp_v11_0_set_psp_funcs(struct psp_context *psp)
drivers/gpu/drm/amd/amdgpu/psp_v12_0.c +26 -0
index 8f553f6f92d6..75b3f9d15a18 100644
@@ -547,6 +547,30 @@ static int psp_v12_0_mode1_reset(struct psp_context *psp)
 	return 0;
 }
 
+static uint32_t psp_v12_0_ring_get_wptr(struct psp_context *psp)
+{
+	uint32_t data;
+	struct amdgpu_device *adev = psp->adev;
+
+	if (psp_v12_0_support_vmr_ring(psp))
+		data = RREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_102);
+	else
+		data = RREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_67);
+
+	return data;
+}
+
+static void psp_v12_0_ring_set_wptr(struct psp_context *psp, uint32_t value)
+{
+	struct amdgpu_device *adev = psp->adev;
+
+	if (psp_v12_0_support_vmr_ring(psp)) {
+		WREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_102, value);
+		WREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_101, GFX_CTRL_CMD_ID_CONSUME_CMD);
+	} else
+		WREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_67, value);
+}
+
 static const struct psp_funcs psp_v12_0_funcs = {
 	.init_microcode = psp_v12_0_init_microcode,
 	.bootloader_load_sysdrv = psp_v12_0_bootloader_load_sysdrv,
@@ -558,6 +582,8 @@ static const struct psp_funcs psp_v12_0_funcs = {
 	.cmd_submit = psp_v12_0_cmd_submit,
 	.compare_sram_data = psp_v12_0_compare_sram_data,
 	.mode1_reset = psp_v12_0_mode1_reset,
+	.ring_get_wptr = psp_v12_0_ring_get_wptr,
+	.ring_set_wptr = psp_v12_0_ring_set_wptr,
 };
 
 void psp_v12_0_set_psp_funcs(struct psp_context *psp)
drivers/gpu/drm/amd/amdgpu/psp_v3_1.c +27 -0
index f652241aa71a..1de86e550a90 100644
@@ -640,6 +640,31 @@ static bool psp_v3_1_support_vmr_ring(struct psp_context *psp)
 	return false;
 }
 
+static uint32_t psp_v3_1_ring_get_wptr(struct psp_context *psp)
+{
+	uint32_t data;
+	struct amdgpu_device *adev = psp->adev;
+
+	if (psp_v3_1_support_vmr_ring(psp))
+		data = RREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_102);
+	else
+		data = RREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_67);
+	return data;
+}
+
+static void psp_v3_1_ring_set_wptr(struct psp_context *psp, uint32_t value)
+{
+	struct amdgpu_device *adev = psp->adev;
+
+	if (psp_v3_1_support_vmr_ring(psp)) {
+		WREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_102, value);
+		/* send interrupt to PSP for SRIOV ring write pointer update */
+		WREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_101,
+			GFX_CTRL_CMD_ID_CONSUME_CMD);
+	} else
+		WREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_67, value);
+}
+
 static const struct psp_funcs psp_v3_1_funcs = {
 	.init_microcode = psp_v3_1_init_microcode,
 	.bootloader_load_sysdrv = psp_v3_1_bootloader_load_sysdrv,
@@ -653,6 +678,8 @@ static const struct psp_funcs psp_v3_1_funcs = {
 	.smu_reload_quirk = psp_v3_1_smu_reload_quirk,
 	.mode1_reset = psp_v3_1_mode1_reset,
 	.support_vmr_ring = psp_v3_1_support_vmr_ring,
+	.ring_get_wptr = psp_v3_1_ring_get_wptr,
+	.ring_set_wptr = psp_v3_1_ring_set_wptr,
 };
 
 void psp_v3_1_set_psp_funcs(struct psp_context *psp)
Signature · 6 lines
2.17.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 20191118100723.19824-1-Hawking.Zhang-5C7GfCeVMHo@public.gmane.org

#2 lore raw

PATCH 2/3 drm/amdgpu: add helper func for psp ring cmd submission

Except for ring wptr update, the psp ring cmd submission function shouldn't be IP specific one. Create a common helper function to be shared for all the ASICs.

Change-Id Ic59f22f762fc7580fd9438d865d37d5996ce8b84
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 50 +++++++++++++++++++++++++
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h |  4 ++
 2 files changed, 54 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +50 -0
index 9621e207a9ca..225abd42b8de 100644
@@ -1710,6 +1710,56 @@ int psp_update_vcn_sram(struct amdgpu_device *adev, int inst_idx,
 	return psp_execute_np_fw_load(&adev->psp, &ucode);
 }
 
+int psp_ring_cmd_submit(struct psp_context *psp,
+			uint64_t cmd_buf_mc_addr,
+			uint64_t fence_mc_addr,
+			int index)
+{
+	unsigned int psp_write_ptr_reg = 0;
+	struct psp_gfx_rb_frame *write_frame = psp->km_ring.ring_mem;
+	struct psp_ring *ring = &psp->km_ring;
+	struct psp_gfx_rb_frame *ring_buffer_start = ring->ring_mem;
+	struct psp_gfx_rb_frame *ring_buffer_end = ring_buffer_start +
+		ring->ring_size / sizeof(struct psp_gfx_rb_frame) - 1;
+	struct amdgpu_device *adev = psp->adev;
+	uint32_t ring_size_dw = ring->ring_size / 4;
+	uint32_t rb_frame_size_dw = sizeof(struct psp_gfx_rb_frame) / 4;
+
+	/* KM (GPCOM) prepare write pointer */
+	psp_write_ptr_reg = psp_ring_get_wptr(psp);
+
+	/* Update KM RB frame pointer to new frame */
+	/* write_frame ptr increments by size of rb_frame in bytes */
+	/* psp_write_ptr_reg increments by size of rb_frame in DWORDs */
+	if ((psp_write_ptr_reg % ring_size_dw) == 0)
+		write_frame = ring_buffer_start;
+	else
+		write_frame = ring_buffer_start + (psp_write_ptr_reg / rb_frame_size_dw);
+	/* Check invalid write_frame ptr address */
+	if ((write_frame < ring_buffer_start) || (ring_buffer_end < write_frame)) {
+		DRM_ERROR("ring_buffer_start = %p; ring_buffer_end = %p; write_frame = %p\n",
+			  ring_buffer_start, ring_buffer_end, write_frame);
+		DRM_ERROR("write_frame is pointing to address out of bounds\n");
+		return -EINVAL;
+	}
+
+	/* Initialize KM RB frame */
+	memset(write_frame, 0, sizeof(struct psp_gfx_rb_frame));
+
+	/* Update KM RB frame */
+	write_frame->cmd_buf_addr_hi = upper_32_bits(cmd_buf_mc_addr);
+	write_frame->cmd_buf_addr_lo = lower_32_bits(cmd_buf_mc_addr);
+	write_frame->fence_addr_hi = upper_32_bits(fence_mc_addr);
+	write_frame->fence_addr_lo = lower_32_bits(fence_mc_addr);
+	write_frame->fence_value = index;
+	amdgpu_asic_flush_hdp(adev, NULL);
+
+	/* Update the write Pointer in DWORDs */
+	psp_write_ptr_reg = (psp_write_ptr_reg + rb_frame_size_dw) % ring_size_dw;
+	psp_ring_set_wptr(psp, psp_write_ptr_reg);
+	return 0;
+}
+
 static bool psp_check_fw_loading_status(struct amdgpu_device *adev,
 					enum AMDGPU_UCODE_ID ucode_type)
 {
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h +4 -0
index d5620c46f3fc..482e7675b7da 100644
@@ -377,4 +377,8 @@ int psp_rlc_autoload_start(struct psp_context *psp);
 extern const struct amdgpu_ip_block_version psp_v11_0_ip_block;
 int psp_reg_program(struct psp_context *psp, enum psp_reg_prog_id reg,
 		uint32_t value);
+int psp_ring_cmd_submit(struct psp_context *psp,
+			uint64_t cmd_buf_mc_addr,
+			uint64_t fence_mc_addr,
+			int index);
 #endif
Signature · 6 lines
2.17.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#3 lore raw

PATCH 3/3 drm/amdgpu: switch to common helper func for psp cmd submission

In reply to a message not in the archive

Drop all the IP specific cmd_submit callback function and use the common helper instead

Change-Id I865b26fd25a696f213e888beb927717dec884546
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c |  2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h |  5 ---
 drivers/gpu/drm/amd/amdgpu/psp_v10_0.c  | 49 --------------------
 drivers/gpu/drm/amd/amdgpu/psp_v11_0.c  | 58 ------------------------
 drivers/gpu/drm/amd/amdgpu/psp_v12_0.c  | 58 ------------------------
 drivers/gpu/drm/amd/amdgpu/psp_v3_1.c   | 60 -------------------------
 6 files changed, 1 insertion(+), 231 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +1 -1
index 225abd42b8de..9e7cfa5e57eb 100644
@@ -156,7 +156,7 @@ psp_cmd_submit_buf(struct psp_context *psp,
 	memcpy(psp->cmd_buf_mem, cmd, sizeof(struct psp_gfx_cmd_resp));
 
 	index = atomic_inc_return(&psp->fence_value);
-	ret = psp_cmd_submit(psp, psp->cmd_buf_mc_addr, fence_mc_addr, index);
+	ret = psp_ring_cmd_submit(psp, psp->cmd_buf_mc_addr, fence_mc_addr, index);
 	if (ret) {
 		atomic_dec(&psp->fence_value);
 		mutex_unlock(&psp->mutex);
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h +0 -5
index 482e7675b7da..40594f27dab1 100644
@@ -94,9 +94,6 @@ struct psp_funcs
 			    enum psp_ring_type ring_type);
 	int (*ring_destroy)(struct psp_context *psp,
 			    enum psp_ring_type ring_type);
-	int (*cmd_submit)(struct psp_context *psp,
-			  uint64_t cmd_buf_mc_addr, uint64_t fence_mc_addr,
-			  int index);
 	bool (*compare_sram_data)(struct psp_context *psp,
 				  struct amdgpu_firmware_info *ucode,
 				  enum AMDGPU_UCODE_ID ucode_type);
@@ -302,8 +299,6 @@ struct amdgpu_psp_funcs {
 #define psp_ring_create(psp, type) (psp)->funcs->ring_create((psp), (type))
 #define psp_ring_stop(psp, type) (psp)->funcs->ring_stop((psp), (type))
 #define psp_ring_destroy(psp, type) ((psp)->funcs->ring_destroy((psp), (type)))
-#define psp_cmd_submit(psp, cmd_mc, fence_mc, index) \
-		(psp)->funcs->cmd_submit((psp), (cmd_mc), (fence_mc), (index))
 #define psp_compare_sram_data(psp, ucode, type) \
 		(psp)->funcs->compare_sram_data((psp), (ucode), (type))
 #define psp_init_microcode(psp) \
drivers/gpu/drm/amd/amdgpu/psp_v10_0.c +0 -49

61 lines not on this page · raw message

drivers/gpu/drm/amd/amdgpu/psp_v11_0.c +0 -58

70 lines not on this page · raw message

drivers/gpu/drm/amd/amdgpu/psp_v12_0.c +0 -58

70 lines not on this page · raw message

drivers/gpu/drm/amd/amdgpu/psp_v3_1.c +0 -60

72 lines not on this page · raw message

Signature · 6 lines
2.17.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 20191118100723.19824-3-Hawking.Zhang-5C7GfCeVMHo@public.gmane.org

Reviewed-by
#5 lore raw

Re: [PATCH 3/3] drm/amdgpu: switch to common helper func for psp cmd submission

Quoted 6 lines · Hawking Zhang

Drop all the IP specific cmd_submit callback function and use the common helper instead

Change-Id I865b26fd25a696f213e888beb927717dec884546

Nice cleanup!

Series is:

Quoted 345 lines
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c |  2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h |  5 ---
 drivers/gpu/drm/amd/amdgpu/psp_v10_0.c  | 49 --------------------
 drivers/gpu/drm/amd/amdgpu/psp_v11_0.c  | 58 ------------------------
 drivers/gpu/drm/amd/amdgpu/psp_v12_0.c  | 58 ------------------------
 drivers/gpu/drm/amd/amdgpu/psp_v3_1.c   | 60 -------------------------
 6 files changed, 1 insertion(+), 231 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +1 -1
index 225abd42b8de..9e7cfa5e57eb 100644
@@ -156,7 +156,7 @@ psp_cmd_submit_buf(struct psp_context *psp,
        memcpy(psp->cmd_buf_mem, cmd, sizeof(struct psp_gfx_cmd_resp));
 
        index = atomic_inc_return(&psp->fence_value);
-       ret = psp_cmd_submit(psp, psp->cmd_buf_mc_addr, fence_mc_addr, index);
+       ret = psp_ring_cmd_submit(psp, psp->cmd_buf_mc_addr, fence_mc_addr, index);
        if (ret) {
                atomic_dec(&psp->fence_value);
                mutex_unlock(&psp->mutex);
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h +0 -5
index 482e7675b7da..40594f27dab1 100644
@@ -94,9 +94,6 @@ struct psp_funcs
                            enum psp_ring_type ring_type);
        int (*ring_destroy)(struct psp_context *psp,
                            enum psp_ring_type ring_type);
-       int (*cmd_submit)(struct psp_context *psp,
-                         uint64_t cmd_buf_mc_addr, uint64_t fence_mc_addr,
-                         int index);
        bool (*compare_sram_data)(struct psp_context *psp,
                                  struct amdgpu_firmware_info *ucode,
                                  enum AMDGPU_UCODE_ID ucode_type);
@@ -302,8 +299,6 @@ struct amdgpu_psp_funcs {
 #define psp_ring_create(psp, type) (psp)->funcs->ring_create((psp), (type))
 #define psp_ring_stop(psp, type) (psp)->funcs->ring_stop((psp), (type))
 #define psp_ring_destroy(psp, type) ((psp)->funcs->ring_destroy((psp), (type)))
-#define psp_cmd_submit(psp, cmd_mc, fence_mc, index) \
-               (psp)->funcs->cmd_submit((psp), (cmd_mc), (fence_mc), (index))
 #define psp_compare_sram_data(psp, ucode, type) \
                (psp)->funcs->compare_sram_data((psp), (ucode), (type))
 #define psp_init_microcode(psp) \
drivers/gpu/drm/amd/amdgpu/psp_v10_0.c +0 -49
index b8a461d46cb5..e7d56c25b0f8 100644
@@ -227,54 +227,6 @@ static int psp_v10_0_ring_destroy(struct psp_context *psp,
        return ret;
 }
 
-static int psp_v10_0_cmd_submit(struct psp_context *psp,
-                               uint64_t cmd_buf_mc_addr, uint64_t fence_mc_addr,
-                               int index)
-{
-       unsigned int psp_write_ptr_reg = 0;
-       struct psp_gfx_rb_frame * write_frame = psp->km_ring.ring_mem;
-       struct psp_ring *ring = &psp->km_ring;
-       struct psp_gfx_rb_frame *ring_buffer_start = ring->ring_mem;
-       struct psp_gfx_rb_frame *ring_buffer_end = ring_buffer_start +
-               ring->ring_size / sizeof(struct psp_gfx_rb_frame) - 1;
-       struct amdgpu_device *adev = psp->adev;
-       uint32_t ring_size_dw = ring->ring_size / 4;
-       uint32_t rb_frame_size_dw = sizeof(struct psp_gfx_rb_frame) / 4;
-
-       /* KM (GPCOM) prepare write pointer */
-       psp_write_ptr_reg = RREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_67);
-
-       /* Update KM RB frame pointer to new frame */
-       if ((psp_write_ptr_reg % ring_size_dw) == 0)
-               write_frame = ring_buffer_start;
-       else
-               write_frame = ring_buffer_start + (psp_write_ptr_reg / rb_frame_size_dw);
-       /* Check invalid write_frame ptr address */
-       if ((write_frame < ring_buffer_start) || (ring_buffer_end < write_frame)) {
-               DRM_ERROR("ring_buffer_start = %p; ring_buffer_end = %p; write_frame = %p\n",
-                         ring_buffer_start, ring_buffer_end, write_frame);
-               DRM_ERROR("write_frame is pointing to address out of bounds\n");
-               return -EINVAL;
-       }
-
-       /* Initialize KM RB frame */
-       memset(write_frame, 0, sizeof(struct psp_gfx_rb_frame));
-
-       /* Update KM RB frame */
-       write_frame->cmd_buf_addr_hi = upper_32_bits(cmd_buf_mc_addr);
-       write_frame->cmd_buf_addr_lo = lower_32_bits(cmd_buf_mc_addr);
-       write_frame->fence_addr_hi = upper_32_bits(fence_mc_addr);
-       write_frame->fence_addr_lo = lower_32_bits(fence_mc_addr);
-       write_frame->fence_value = index;
-       amdgpu_asic_flush_hdp(adev, NULL);
-
-       /* Update the write Pointer in DWORDs */
-       psp_write_ptr_reg = (psp_write_ptr_reg + rb_frame_size_dw) % ring_size_dw;
-       WREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_67, psp_write_ptr_reg);
-
-       return 0;
-}
-
 static int
 psp_v10_0_sram_map(struct amdgpu_device *adev,
                   unsigned int *sram_offset, unsigned int *sram_addr_reg_offset,
@@ -424,7 +376,6 @@ static const struct psp_funcs psp_v10_0_funcs = {
        .ring_create = psp_v10_0_ring_create,
        .ring_stop = psp_v10_0_ring_stop,
        .ring_destroy = psp_v10_0_ring_destroy,
-       .cmd_submit = psp_v10_0_cmd_submit,
        .compare_sram_data = psp_v10_0_compare_sram_data,
        .mode1_reset = psp_v10_0_mode1_reset,
        .ring_get_wptr = psp_v10_0_ring_get_wptr,
drivers/gpu/drm/amd/amdgpu/psp_v11_0.c +0 -58
index 79fa2c655857..0dcf6d4277c2 100644
@@ -517,63 +517,6 @@ static int psp_v11_0_ring_destroy(struct psp_context *psp,
        return ret;
 }
 
-static int psp_v11_0_cmd_submit(struct psp_context *psp,
-                              uint64_t cmd_buf_mc_addr, uint64_t fence_mc_addr,
-                              int index)
-{
-       unsigned int psp_write_ptr_reg = 0;
-       struct psp_gfx_rb_frame *write_frame = psp->km_ring.ring_mem;
-       struct psp_ring *ring = &psp->km_ring;
-       struct psp_gfx_rb_frame *ring_buffer_start = ring->ring_mem;
-       struct psp_gfx_rb_frame *ring_buffer_end = ring_buffer_start +
-               ring->ring_size / sizeof(struct psp_gfx_rb_frame) - 1;
-       struct amdgpu_device *adev = psp->adev;
-       uint32_t ring_size_dw = ring->ring_size / 4;
-       uint32_t rb_frame_size_dw = sizeof(struct psp_gfx_rb_frame) / 4;
-
-       /* KM (GPCOM) prepare write pointer */
-       if (psp_v11_0_support_vmr_ring(psp))
-               psp_write_ptr_reg = RREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_102);
-       else
-               psp_write_ptr_reg = RREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_67);
-
-       /* Update KM RB frame pointer to new frame */
-       /* write_frame ptr increments by size of rb_frame in bytes */
-       /* psp_write_ptr_reg increments by size of rb_frame in DWORDs */
-       if ((psp_write_ptr_reg % ring_size_dw) == 0)
-               write_frame = ring_buffer_start;
-       else
-               write_frame = ring_buffer_start + (psp_write_ptr_reg / rb_frame_size_dw);
-       /* Check invalid write_frame ptr address */
-       if ((write_frame < ring_buffer_start) || (ring_buffer_end < write_frame)) {
-               DRM_ERROR("ring_buffer_start = %p; ring_buffer_end = %p; write_frame = %p\n",
-                         ring_buffer_start, ring_buffer_end, write_frame);
-               DRM_ERROR("write_frame is pointing to address out of bounds\n");
-               return -EINVAL;
-       }
-
-       /* Initialize KM RB frame */
-       memset(write_frame, 0, sizeof(struct psp_gfx_rb_frame));
-
-       /* Update KM RB frame */
-       write_frame->cmd_buf_addr_hi = upper_32_bits(cmd_buf_mc_addr);
-       write_frame->cmd_buf_addr_lo = lower_32_bits(cmd_buf_mc_addr);
-       write_frame->fence_addr_hi = upper_32_bits(fence_mc_addr);
-       write_frame->fence_addr_lo = lower_32_bits(fence_mc_addr);
-       write_frame->fence_value = index;
-       amdgpu_asic_flush_hdp(adev, NULL);
-
-       /* Update the write Pointer in DWORDs */
-       psp_write_ptr_reg = (psp_write_ptr_reg + rb_frame_size_dw) % ring_size_dw;
-       if (psp_v11_0_support_vmr_ring(psp)) {
-               WREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_102, psp_write_ptr_reg);
-               WREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_101, GFX_CTRL_CMD_ID_CONSUME_CMD);
-       } else
-               WREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_67, psp_write_ptr_reg);
-
-       return 0;
-}
-
 static int
 psp_v11_0_sram_map(struct amdgpu_device *adev,
                  unsigned int *sram_offset, unsigned int *sram_addr_reg_offset,
@@ -1099,7 +1042,6 @@ static const struct psp_funcs psp_v11_0_funcs = {
        .ring_create = psp_v11_0_ring_create,
        .ring_stop = psp_v11_0_ring_stop,
        .ring_destroy = psp_v11_0_ring_destroy,
-       .cmd_submit = psp_v11_0_cmd_submit,
        .compare_sram_data = psp_v11_0_compare_sram_data,
        .mode1_reset = psp_v11_0_mode1_reset,
        .xgmi_get_topology_info = psp_v11_0_xgmi_get_topology_info,
drivers/gpu/drm/amd/amdgpu/psp_v12_0.c +0 -58
index 75b3f9d15a18..58d8b6d732e8 100644
@@ -334,63 +334,6 @@ static int psp_v12_0_ring_destroy(struct psp_context *psp,
        return ret;
 }
 
-static int psp_v12_0_cmd_submit(struct psp_context *psp,
-                              uint64_t cmd_buf_mc_addr, uint64_t fence_mc_addr,
-                              int index)
-{
-       unsigned int psp_write_ptr_reg = 0;
-       struct psp_gfx_rb_frame *write_frame = psp->km_ring.ring_mem;
-       struct psp_ring *ring = &psp->km_ring;
-       struct psp_gfx_rb_frame *ring_buffer_start = ring->ring_mem;
-       struct psp_gfx_rb_frame *ring_buffer_end = ring_buffer_start +
-               ring->ring_size / sizeof(struct psp_gfx_rb_frame) - 1;
-       struct amdgpu_device *adev = psp->adev;
-       uint32_t ring_size_dw = ring->ring_size / 4;
-       uint32_t rb_frame_size_dw = sizeof(struct psp_gfx_rb_frame) / 4;
-
-       /* KM (GPCOM) prepare write pointer */
-       if (psp_v12_0_support_vmr_ring(psp))
-               psp_write_ptr_reg = RREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_102);
-       else
-               psp_write_ptr_reg = RREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_67);
-
-       /* Update KM RB frame pointer to new frame */
-       /* write_frame ptr increments by size of rb_frame in bytes */
-       /* psp_write_ptr_reg increments by size of rb_frame in DWORDs */
-       if ((psp_write_ptr_reg % ring_size_dw) == 0)
-               write_frame = ring_buffer_start;
-       else
-               write_frame = ring_buffer_start + (psp_write_ptr_reg / rb_frame_size_dw);
-       /* Check invalid write_frame ptr address */
-       if ((write_frame < ring_buffer_start) || (ring_buffer_end < write_frame)) {
-               DRM_ERROR("ring_buffer_start = %p; ring_buffer_end = %p; write_frame = %p\n",
-                         ring_buffer_start, ring_buffer_end, write_frame);
-               DRM_ERROR("write_frame is pointing to address out of bounds\n");
-               return -EINVAL;
-       }
-
-       /* Initialize KM RB frame */
-       memset(write_frame, 0, sizeof(struct psp_gfx_rb_frame));
-
-       /* Update KM RB frame */
-       write_frame->cmd_buf_addr_hi = upper_32_bits(cmd_buf_mc_addr);
-       write_frame->cmd_buf_addr_lo = lower_32_bits(cmd_buf_mc_addr);
-       write_frame->fence_addr_hi = upper_32_bits(fence_mc_addr);
-       write_frame->fence_addr_lo = lower_32_bits(fence_mc_addr);
-       write_frame->fence_value = index;
-       amdgpu_asic_flush_hdp(adev, NULL);
-
-       /* Update the write Pointer in DWORDs */
-       psp_write_ptr_reg = (psp_write_ptr_reg + rb_frame_size_dw) % ring_size_dw;
-       if (psp_v12_0_support_vmr_ring(psp)) {
-               WREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_102, psp_write_ptr_reg);
-               WREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_101, GFX_CTRL_CMD_ID_CONSUME_CMD);
-       } else
-               WREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_67, psp_write_ptr_reg);
-
-       return 0;
-}
-
 static int
 psp_v12_0_sram_map(struct amdgpu_device *adev,
                  unsigned int *sram_offset, unsigned int *sram_addr_reg_offset,
@@ -579,7 +522,6 @@ static const struct psp_funcs psp_v12_0_funcs = {
        .ring_create = psp_v12_0_ring_create,
        .ring_stop = psp_v12_0_ring_stop,
        .ring_destroy = psp_v12_0_ring_destroy,
-       .cmd_submit = psp_v12_0_cmd_submit,
        .compare_sram_data = psp_v12_0_compare_sram_data,
        .mode1_reset = psp_v12_0_mode1_reset,
        .ring_get_wptr = psp_v12_0_ring_get_wptr,
drivers/gpu/drm/amd/amdgpu/psp_v3_1.c +0 -61
index 1de86e550a90..839806cf1c6a 100644
@@ -408,65 +408,6 @@ static int psp_v3_1_ring_destroy(struct psp_context *psp,
        return ret;
 }
 
-static int psp_v3_1_cmd_submit(struct psp_context *psp,
-                              uint64_t cmd_buf_mc_addr, uint64_t fence_mc_addr,
-                              int index)
-{
-       unsigned int psp_write_ptr_reg = 0;
-       struct psp_gfx_rb_frame * write_frame = psp->km_ring.ring_mem;
-       struct psp_ring *ring = &psp->km_ring;
-       struct psp_gfx_rb_frame *ring_buffer_start = ring->ring_mem;
-       struct psp_gfx_rb_frame *ring_buffer_end = ring_buffer_start +
-               ring->ring_size / sizeof(struct psp_gfx_rb_frame) - 1;
-       struct amdgpu_device *adev = psp->adev;
-       uint32_t ring_size_dw = ring->ring_size / 4;
-       uint32_t rb_frame_size_dw = sizeof(struct psp_gfx_rb_frame) / 4;
-
-       /* KM (GPCOM) prepare write pointer */
-       if (psp_v3_1_support_vmr_ring(psp))
-               psp_write_ptr_reg = RREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_102);
-       else
-               psp_write_ptr_reg = RREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_67);
-
-       /* Update KM RB frame pointer to new frame */
-       /* write_frame ptr increments by size of rb_frame in bytes */
-       /* psp_write_ptr_reg increments by size of rb_frame in DWORDs */
-       if ((psp_write_ptr_reg % ring_size_dw) == 0)
-               write_frame = ring_buffer_start;
-       else
-               write_frame = ring_buffer_start + (psp_write_ptr_reg / rb_frame_size_dw);
-       /* Check invalid write_frame ptr address */
-       if ((write_frame < ring_buffer_start) || (ring_buffer_end < write_frame)) {
-               DRM_ERROR("ring_buffer_start = %p; ring_buffer_end = %p; write_frame = %p\n",
-                         ring_buffer_start, ring_buffer_end, write_frame);
-               DRM_ERROR("write_frame is pointing to address out of bounds\n");
-               return -EINVAL;
-       }
-
-       /* Initialize KM RB frame */
-       memset(write_frame, 0, sizeof(struct psp_gfx_rb_frame));
-
-       /* Update KM RB frame */
-       write_frame->cmd_buf_addr_hi = upper_32_bits(cmd_buf_mc_addr);
-       write_frame->cmd_buf_addr_lo = lower_32_bits(cmd_buf_mc_addr);
-       write_frame->fence_addr_hi = upper_32_bits(fence_mc_addr);
-       write_frame->fence_addr_lo = lower_32_bits(fence_mc_addr);
-       write_frame->fence_value = index;
-       amdgpu_asic_flush_hdp(adev, NULL);
-
-       /* Update the write Pointer in DWORDs */
-       psp_write_ptr_reg = (psp_write_ptr_reg + rb_frame_size_dw) % ring_size_dw;
-       if (psp_v3_1_support_vmr_ring(psp)) {
-               WREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_102, psp_write_ptr_reg);
-               /* send interrupt to PSP for SRIOV ring write pointer update */
-               WREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_101,
-                                       GFX_CTRL_CMD_ID_CONSUME_CMD);
-       } else
-               WREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_67, psp_write_ptr_reg);
-
-       return 0;
-}
-
 static int
 psp_v3_1_sram_map(struct amdgpu_device *adev,
                  unsigned int *sram_offset, unsigned int *sram_addr_reg_offset,
@@ -673,7 +614,6 @@ static const struct psp_funcs psp_v3_1_funcs = {
        .ring_create = psp_v3_1_ring_create,
        .ring_stop = psp_v3_1_ring_stop,
        .ring_destroy = psp_v3_1_ring_destroy,
-       .cmd_submit = psp_v3_1_cmd_submit,
        .compare_sram_data = psp_v3_1_compare_sram_data,
        .smu_reload_quirk = psp_v3_1_smu_reload_quirk,
        .mode1_reset = psp_v3_1_mode1_reset,
--

2.17.1

Quoted 4 lines

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

#6 lore raw
In reply to a message not in the archive

Series Reviewed-by: John Clements <[email protected]>

-----Original Message-----
From: Hawking Zhang <[email protected]>
Sent: Monday, November 18, 2019 6:07 PM
To: [email protected]; Clements, John <[email protected]>; Deucher, Alexander <[email protected]>
Cc: Zhang, Hawking <[email protected]>
Subject: [PATCH 1/3] drm/amdgpu: add psp funcs for ring write pointer read/write

The ring write pointer regsiter update is the only part that is IP specific ones in psp_cmd_submit function.

Add two callbacks for wptr read/write so that we unify the psp_cmd_submit function for all the ASICs.

Change-Id Idd0b70bd8682f8bd2f9b92098d6ce55fa4cee310
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h |  5 +++++  drivers/gpu/drm/amd/amdgpu/psp_v10_0.c  | 16 +++++++++++++++  drivers/gpu/drm/amd/amdgpu/psp_v11_0.c  | 26 ++++++++++++++++++++++++  drivers/gpu/drm/amd/amdgpu/psp_v12_0.c  | 26 ++++++++++++++++++++++++
 drivers/gpu/drm/amd/amdgpu/psp_v3_1.c   | 27 +++++++++++++++++++++++++
 5 files changed, 100 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h +6 -0
index 09c5474ebcc3..d5620c46f3fc 100644
@@ -116,6 +116,8 @@ struct psp_funcs
 	int (*mem_training_init)(struct psp_context *psp);
 	void (*mem_training_fini)(struct psp_context *psp);
 	int (*mem_training)(struct psp_context *psp, uint32_t ops);
+	uint32_t (*ring_get_wptr)(struct psp_context *psp);
+	void (*ring_set_wptr)(struct psp_context *psp, uint32_t value);
 };
 
 #define AMDGPU_XGMI_MAX_CONNECTED_NODES		64
@@ -346,6 +348,9 @@ struct amdgpu_psp_funcs {
 	((psp)->funcs->ras_cure_posion ? \
 	(psp)->funcs->ras_cure_posion(psp, (addr)) : -EINVAL)
 
+#define psp_ring_get_wptr(psp) (psp)->funcs->ring_get_wptr((psp))
+#define psp_ring_set_wptr(psp, value) 
+(psp)->funcs->ring_set_wptr((psp), (value))
+
 extern const struct amd_ip_funcs psp_ip_funcs;
 

extern const struct amdgpu_ip_block_version psp_v3_1_ip_block; diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v10_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v10_0.c
index ed8beff02e62..b8a461d46cb5 100644

drivers/gpu/drm/amd/amdgpu/psp_v10_0.c +13 -0
@@ -404,6 +404,20 @@ static int psp_v10_0_mode1_reset(struct psp_context *psp)
 	return -EINVAL;
 }
 
+static uint32_t psp_v10_0_ring_get_wptr(struct psp_context *psp) {
+	struct amdgpu_device *adev = psp->adev;
+
+	return RREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_67); }
+
+static void psp_v10_0_ring_set_wptr(struct psp_context *psp, uint32_t 
+value) {
+	struct amdgpu_device *adev = psp->adev;
+
+	WREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_67, value); }
+
 static const struct psp_funcs psp_v10_0_funcs = {
 	.init_microcode = psp_v10_0_init_microcode,
 	.ring_init = psp_v10_0_ring_init,
@@ -413,6 +427,8 @@ static const struct psp_funcs psp_v10_0_funcs = {
 	.cmd_submit = psp_v10_0_cmd_submit,
 	.compare_sram_data = psp_v10_0_compare_sram_data,
 	.mode1_reset = psp_v10_0_mode1_reset,
+	.ring_get_wptr = psp_v10_0_ring_get_wptr,
+	.ring_set_wptr = psp_v10_0_ring_set_wptr,
 };
 
 void psp_v10_0_set_psp_funcs(struct psp_context *psp) diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c

index ebd96c3c58b9..79fa2c655857 100644

drivers/gpu/drm/amd/amdgpu/psp_v11_0.c +22 -0
@@ -1066,6 +1066,30 @@ static int psp_v11_0_memory_training(struct psp_context *psp, uint32_t ops)
 	return 0;
 }
 
+static uint32_t psp_v11_0_ring_get_wptr(struct psp_context *psp) {
+	uint32_t data;
+	struct amdgpu_device *adev = psp->adev;
+
+	if (psp_v11_0_support_vmr_ring(psp))
+		data = RREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_102);
+	else
+		data = RREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_67);
+
+	return data;
+}
+
+static void psp_v11_0_ring_set_wptr(struct psp_context *psp, uint32_t 
+value) {
+	struct amdgpu_device *adev = psp->adev;
+
+	if (psp_v11_0_support_vmr_ring(psp)) {
+		WREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_102, value);
+		WREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_101, GFX_CTRL_CMD_ID_CONSUME_CMD);
+	} else
+		WREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_67, value); }
+
 static const struct psp_funcs psp_v11_0_funcs = {
 	.init_microcode = psp_v11_0_init_microcode,
 	.bootloader_load_kdb = psp_v11_0_bootloader_load_kdb, @@ -1089,6 +1113,8 @@ static const struct psp_funcs psp_v11_0_funcs = {

.mem_training_init = psp_v11_0_memory_training_init, .mem_training_fini = psp_v11_0_memory_training_fini, .mem_training = psp_v11_0_memory_training,
+ .ring_get_wptr = psp_v11_0_ring_get_wptr,
+ .ring_set_wptr = psp_v11_0_ring_set_wptr,
};

void psp_v11_0_set_psp_funcs(struct psp_context *psp) diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c
index 8f553f6f92d6..75b3f9d15a18 100644

drivers/gpu/drm/amd/amdgpu/psp_v12_0.c +22 -0
@@ -547,6 +547,30 @@ static int psp_v12_0_mode1_reset(struct psp_context *psp)
 	return 0;
 }
 
+static uint32_t psp_v12_0_ring_get_wptr(struct psp_context *psp) {
+	uint32_t data;
+	struct amdgpu_device *adev = psp->adev;
+
+	if (psp_v12_0_support_vmr_ring(psp))
+		data = RREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_102);
+	else
+		data = RREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_67);
+
+	return data;
+}
+
+static void psp_v12_0_ring_set_wptr(struct psp_context *psp, uint32_t 
+value) {
+	struct amdgpu_device *adev = psp->adev;
+
+	if (psp_v12_0_support_vmr_ring(psp)) {
+		WREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_102, value);
+		WREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_101, GFX_CTRL_CMD_ID_CONSUME_CMD);
+	} else
+		WREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_67, value); }
+
 static const struct psp_funcs psp_v12_0_funcs = {
 	.init_microcode = psp_v12_0_init_microcode,
 	.bootloader_load_sysdrv = psp_v12_0_bootloader_load_sysdrv, @@ -558,6 +582,8 @@ static const struct psp_funcs psp_v12_0_funcs = {

.cmd_submit = psp_v12_0_cmd_submit, .compare_sram_data = psp_v12_0_compare_sram_data, .mode1_reset = psp_v12_0_mode1_reset,
+ .ring_get_wptr = psp_v12_0_ring_get_wptr,
+ .ring_set_wptr = psp_v12_0_ring_set_wptr,
};

void psp_v12_0_set_psp_funcs(struct psp_context *psp) diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c b/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
index f652241aa71a..1de86e550a90 100644

drivers/gpu/drm/amd/amdgpu/psp_v3_1.c +23 -0
@@ -640,6 +640,31 @@ static bool psp_v3_1_support_vmr_ring(struct psp_context *psp)
 	return false;
 }
 
+static uint32_t psp_v3_1_ring_get_wptr(struct psp_context *psp) {
+	uint32_t data;
+	struct amdgpu_device *adev = psp->adev;
+
+	if (psp_v3_1_support_vmr_ring(psp))
+		data = RREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_102);
+	else
+		data = RREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_67);
+	return data;
+}
+
+static void psp_v3_1_ring_set_wptr(struct psp_context *psp, uint32_t 
+value) {
+	struct amdgpu_device *adev = psp->adev;
+
+	if (psp_v3_1_support_vmr_ring(psp)) {
+		WREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_102, value);
+		/* send interrupt to PSP for SRIOV ring write pointer update */
+		WREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_101,
+			GFX_CTRL_CMD_ID_CONSUME_CMD);
+	} else
+		WREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_67, value); }
+
 static const struct psp_funcs psp_v3_1_funcs = {
 	.init_microcode = psp_v3_1_init_microcode,
 	.bootloader_load_sysdrv = psp_v3_1_bootloader_load_sysdrv, @@ -653,6 +678,8 @@ static const struct psp_funcs psp_v3_1_funcs = {

.smu_reload_quirk = psp_v3_1_smu_reload_quirk, .mode1_reset = psp_v3_1_mode1_reset, .support_vmr_ring = psp_v3_1_support_vmr_ring,
+ .ring_get_wptr = psp_v3_1_ring_get_wptr,
+ .ring_set_wptr = psp_v3_1_ring_set_wptr,
};

void psp_v3_1_set_psp_funcs(struct psp_context *psp)
--
2.17.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx