[PATCH 1/2] Revert "drm/amdgpu: update kernel vcn ring test"

[Saleemkhan Jamadar]

VCN FW depncencies revert it to unblock others

This reverts commit d0edfbe8bc2d18ede8f805c6eb71c63e0b40c1da.

Signed-off-by: Saleemkhan Jamadar <saleemkhan.jamadar at amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
index 5c2aa925dd79..8966ffb2f4a0 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
@@ -539,7 +539,6 @@ static int amdgpu_vcn_dec_send_msg(struct amdgpu_ring *ring,
 				   struct dma_fence **fence)
 {
 	u64 addr = AMDGPU_GPU_PAGE_ALIGN(ib_msg->gpu_addr);
-	uint64_t session_ctx_buf_gaddr = AMDGPU_GPU_PAGE_ALIGN(ib_msg->gpu_addr + 8192);
 	struct amdgpu_device *adev = ring->adev;
 	struct dma_fence *f = NULL;
 	struct amdgpu_job *job;
@@ -553,23 +552,13 @@ static int amdgpu_vcn_dec_send_msg(struct amdgpu_ring *ring,
 		goto err;
 
 	ib = &job->ibs[0];
-	ib->length_dw = 0;
-	ib->ptr[ib->length_dw++] = PACKET0(adev->vcn.internal.data0, 0);
-	ib->ptr[ib->length_dw++] = lower_32_bits(session_ctx_buf_gaddr);
-	ib->ptr[ib->length_dw++] = PACKET0(adev->vcn.internal.data1, 0);
-	ib->ptr[ib->length_dw++] = upper_32_bits(session_ctx_buf_gaddr);
-	/* session ctx buffer cmd */
-	ib->ptr[ib->length_dw++] = PACKET0(adev->vcn.internal.cmd, 0);
-	ib->ptr[ib->length_dw++] = 0xa;
-
-	ib->ptr[ib->length_dw++] = PACKET0(adev->vcn.internal.data0, 0);
-	ib->ptr[ib->length_dw++] = lower_32_bits(addr);
-	ib->ptr[ib->length_dw++] = PACKET0(adev->vcn.internal.data1, 0);
-	ib->ptr[ib->length_dw++] = upper_32_bits(addr);
-	ib->ptr[ib->length_dw++] = PACKET0(adev->vcn.internal.cmd, 0);
-	ib->ptr[ib->length_dw++] = 0;
-
-	for (i = ib->length_dw; i < 16; i += 2) {
+	ib->ptr[0] = PACKET0(adev->vcn.internal.data0, 0);
+	ib->ptr[1] = addr;
+	ib->ptr[2] = PACKET0(adev->vcn.internal.data1, 0);
+	ib->ptr[3] = addr >> 32;
+	ib->ptr[4] = PACKET0(adev->vcn.internal.cmd, 0);
+	ib->ptr[5] = 0;
+	for (i = 6; i < 16; i += 2) {
 		ib->ptr[i] = PACKET0(adev->vcn.internal.nop, 0);
 		ib->ptr[i+1] = 0;
 	}
-- 
2.25.1