drm/amdgpu: implement insert end ring function for vcn decode

Signed-off-by: Leo Liu <leo.liu@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
index 2fd60de1377e78528644ac886c265b0c6f630d74..adf8e525c6ea6646e4d543b3835da532843cb247 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
@@ -505,6 +505,20 @@ static void vcn_v1_0_dec_ring_insert_start(struct amdgpu_ring *ring)
        amdgpu_ring_write(ring, VCN_CMD_PACKET_START << 1);
 }
 
+/**
+ * vcn_v1_0_dec_ring_insert_end - insert a end command
+ *
+ * @ring: amdgpu_ring pointer
+ *
+ * Write a end command to the ring.
+ */
+static void vcn_v1_0_dec_ring_insert_end(struct amdgpu_ring *ring)
+{
+       amdgpu_ring_write(ring,
+               PACKET0(SOC15_REG_OFFSET(UVD, 0, mmUVD_GPCOM_VCPU_CMD), 0));
+       amdgpu_ring_write(ring, VCN_CMD_PACKET_END << 1);
+}
+
 /**
  * vcn_v1_0_dec_ring_emit_fence - emit an fence & trap command
  *
@@ -701,7 +715,7 @@ static const struct amdgpu_ring_funcs vcn_v1_0_dec_ring_vm_funcs = {
                2 + /* vcn_v1_0_dec_ring_emit_hdp_invalidate */
                34 * AMDGPU_MAX_VMHUBS + /* vcn_v1_0_dec_ring_emit_vm_flush */
                14 + 14 + /* vcn_v1_0_dec_ring_emit_fence x2 vm fence */
-               4,
+               6,
        .emit_ib_size = 8, /* vcn_v1_0_dec_ring_emit_ib */
        .emit_ib = vcn_v1_0_dec_ring_emit_ib,
        .emit_fence = vcn_v1_0_dec_ring_emit_fence,
@@ -711,6 +725,7 @@ static const struct amdgpu_ring_funcs vcn_v1_0_dec_ring_vm_funcs = {
        .test_ib = amdgpu_vcn_dec_ring_test_ib,
        .insert_nop = amdgpu_ring_insert_nop,
        .insert_start = vcn_v1_0_dec_ring_insert_start,
+       .insert_end = vcn_v1_0_dec_ring_insert_end,
        .pad_ib = amdgpu_ring_generic_pad_ib,
        .begin_use = amdgpu_vcn_ring_begin_use,
        .end_use = amdgpu_vcn_ring_end_use,