[PATCH v3 11/19] lib/amdgpu: use macro to add cmds in the user ring

[Sunil Khatri <sunil.khatri@amd.com>]

Use ring add cmds macros to add the cmds in the user
ring instead of directly using the queue ptr and wptr
ptr.

Signed-off-by: Sunil Khatri <sunil.khatri@amd.com>
---
 lib/amdgpu/amd_ip_blocks.h  |  1 -
 lib/amdgpu/amd_user_queue.c | 28 +++++++++++++++-------------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/lib/amdgpu/amd_ip_blocks.h b/lib/amdgpu/amd_ip_blocks.h
index 85d69f5c6..e085f1618 100644
--- a/lib/amdgpu/amd_ip_blocks.h
+++ b/lib/amdgpu/amd_ip_blocks.h
@@ -170,7 +170,6 @@ struct amdgpu_ring_context {
 
 	uint32_t db_handle;
 	uint32_t queue_id;
-	uint32_t npkt;
 
 	uint32_t timeline_syncobj_handle;
 	uint64_t point;
diff --git a/lib/amdgpu/amd_user_queue.c b/lib/amdgpu/amd_user_queue.c
index 9412a37e8..1bfc86949 100644
--- a/lib/amdgpu/amd_user_queue.c
+++ b/lib/amdgpu/amd_user_queue.c
@@ -126,30 +126,32 @@ void amdgpu_user_queue_submit(amdgpu_device_handle device, struct amdgpu_ring_co
 			      unsigned int ip_type, uint64_t mc_address)
 {
 	int r;
-	uint32_t *npkt = &ring_context->npkt;
-	uint32_t *queue_cpu = ring_context->queue_cpu;
 	uint32_t control = ring_context->pm4_dw;
 	uint32_t syncarray[1];
-
 	struct drm_amdgpu_userq_signal signal_data;
 
+
+	amdgpu_pkt_begin();
 	/* Prepare the Indirect IB to submit the IB to user queue */
-	queue_cpu[(*npkt)++] = PACKET3(PACKET3_INDIRECT_BUFFER, 2);
-	queue_cpu[(*npkt)++] = lower_32_bits(mc_address);
-	queue_cpu[(*npkt)++] = upper_32_bits(mc_address);
+	amdgpu_pkt_add_dw(PACKET3(PACKET3_INDIRECT_BUFFER, 2));
+	amdgpu_pkt_add_dw(lower_32_bits(mc_address));
+	amdgpu_pkt_add_dw(upper_32_bits(mc_address));
 
 	if (ip_type == AMD_IP_GFX)
-		queue_cpu[(*npkt)++] = control | S_3F3_INHERIT_VMID_MQD_GFX(1);
+		amdgpu_pkt_add_dw(control | S_3F3_INHERIT_VMID_MQD_GFX(1));
 	else
-		queue_cpu[(*npkt)++] = control | S_3F3_VALID_COMPUTE(1)
-					       | S_3F3_INHERIT_VMID_MQD_COMPUTE(1);
+		amdgpu_pkt_add_dw(control | S_3F3_VALID_COMPUTE(1)
+					       | S_3F3_INHERIT_VMID_MQD_COMPUTE(1));
+
+	amdgpu_pkt_add_dw(PACKET3(PACKET3_PROTECTED_FENCE_SIGNAL, 0));
 
-	queue_cpu[(*npkt)++] = PACKET3(PACKET3_PROTECTED_FENCE_SIGNAL, 0);
 	/* empty dword is needed for fence signal pm4 */
-	++*npkt;
+	amdgpu_pkt_add_dw(0);
+
+	amdgpu_pkt_end();
 
-	*ring_context->wptr_cpu = *npkt;
-	ring_context->doorbell_cpu[DOORBELL_INDEX] = *npkt;
+	/* Update the door bell */
+	ring_context->doorbell_cpu[DOORBELL_INDEX] = *ring_context->wptr_cpu;
 
 	/* Add a fence packet for signal */
 	syncarray[0] = ring_context->timeline_syncobj_handle;
-- 
2.43.0