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

[Gopalakrishnan, Veerabadhran (Veera)]

[AMD Official Use Only - General]

The revert patch set is looking good.

Acked-by: Veerabadhran Gopalakrishnan <Veerabadhran.Gopalakrishnan at amd.com>

-----Original Message-----
From: Jamadar, Saleemkhan <Saleemkhan.Jamadar at amd.com>
Sent: Thursday, July 13, 2023 10:50 AM
To: Jamadar, Saleemkhan <Saleemkhan.Jamadar at amd.com>; amd-gfx at lists.freedesktop.org; Olsak, Marek <Marek.Olsak at amd.com>; Koenig, Christian <Christian.Koenig at amd.com>; Liu, Leo <Leo.Liu at amd.com>; Gopalakrishnan, Veerabadhran (Veera) <Veerabadhran.Gopalakrishnan at amd.com>
Cc: Sundararaju, Sathishkumar <Sathishkumar.Sundararaju at amd.com>
Subject: [PATCH 2/2] Revert "drm/amdgpu:update kernel vcn ring test"

VCN FW depncencies revert it to unblock others

This reverts commit ce085b8068e1071b0068f9a5dee78c97ef587022.

Signed-off-by: Saleemkhan Jamadar <saleemkhan.jamadar at amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 13 ++-----------  drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h |  5 +----
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
index 8966ffb2f4a0..4e1256af80b6 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
@@ -591,15 +591,13 @@ static int amdgpu_vcn_dec_get_create_msg(struct amdgpu_ring *ring, uint32_t hand
        int r, i;

        memset(ib, 0, sizeof(*ib));
-       /* 34 pages : 128KiB  session context buffer size and 8KiB ib msg */
-       r = amdgpu_ib_get(adev, NULL, AMDGPU_GPU_PAGE_SIZE * 34,
+       r = amdgpu_ib_get(adev, NULL, AMDGPU_GPU_PAGE_SIZE * 2,
                        AMDGPU_IB_POOL_DIRECT,
                        ib);
        if (r)
                return r;

        msg = (uint32_t *)AMDGPU_GPU_PAGE_ALIGN((unsigned long)ib->ptr);
-       memset(msg, 0, (AMDGPU_GPU_PAGE_SIZE * 34));
        msg[0] = cpu_to_le32(0x00000028);
        msg[1] = cpu_to_le32(0x00000038);
        msg[2] = cpu_to_le32(0x00000001);
@@ -628,15 +626,13 @@ static int amdgpu_vcn_dec_get_destroy_msg(struct amdgpu_ring *ring, uint32_t han
        int r, i;

        memset(ib, 0, sizeof(*ib));
-       /* 34 pages : 128KiB  session context buffer size and 8KiB ib msg */
-       r = amdgpu_ib_get(adev, NULL, AMDGPU_GPU_PAGE_SIZE * 34,
+       r = amdgpu_ib_get(adev, NULL, AMDGPU_GPU_PAGE_SIZE * 2,
                        AMDGPU_IB_POOL_DIRECT,
                        ib);
        if (r)
                return r;

        msg = (uint32_t *)AMDGPU_GPU_PAGE_ALIGN((unsigned long)ib->ptr);
-       memset(msg, 0, (AMDGPU_GPU_PAGE_SIZE * 34));
        msg[0] = cpu_to_le32(0x00000028);
        msg[1] = cpu_to_le32(0x00000018);
        msg[2] = cpu_to_le32(0x00000000);
@@ -722,7 +718,6 @@ static int amdgpu_vcn_dec_sw_send_msg(struct amdgpu_ring *ring,
        struct amdgpu_job *job;
        struct amdgpu_ib *ib;
        uint64_t addr = AMDGPU_GPU_PAGE_ALIGN(ib_msg->gpu_addr);
-       uint64_t session_ctx_buf_gaddr = AMDGPU_GPU_PAGE_ALIGN(ib_msg->gpu_addr + 8192);
        bool sq = amdgpu_vcn_using_unified_queue(ring);
        uint32_t *ib_checksum;
        uint32_t ib_pack_in_dw;
@@ -753,10 +748,6 @@ static int amdgpu_vcn_dec_sw_send_msg(struct amdgpu_ring *ring,
        ib->length_dw += sizeof(struct amdgpu_vcn_decode_buffer) / 4;
        memset(decode_buffer, 0, sizeof(struct amdgpu_vcn_decode_buffer));

-       decode_buffer->valid_buf_flag |=
-                               cpu_to_le32(AMDGPU_VCN_CMD_FLAG_SESSION_CONTEXT_BUFFER);
-       decode_buffer->session_context_buffer_address_hi = upper_32_bits(session_ctx_buf_gaddr);
-       decode_buffer->session_context_buffer_address_lo = lower_32_bits(session_ctx_buf_gaddr);
        decode_buffer->valid_buf_flag |= cpu_to_le32(AMDGPU_VCN_CMD_FLAG_MSG_BUFFER);
        decode_buffer->msg_buffer_address_hi = cpu_to_le32(addr >> 32);
        decode_buffer->msg_buffer_address_lo = cpu_to_le32(addr); diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h
index ba5fefd74197..1f1d7dc94f90 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h
@@ -171,7 +171,6 @@

 #define AMDGPU_VCN_IB_FLAG_DECODE_BUFFER       0x00000001
 #define AMDGPU_VCN_CMD_FLAG_MSG_BUFFER         0x00000001
-#define AMDGPU_VCN_CMD_FLAG_SESSION_CONTEXT_BUFFER     0x00100000

 #define VCN_CODEC_DISABLE_MASK_AV1  (1 << 0)  #define VCN_CODEC_DISABLE_MASK_VP9  (1 << 1) @@ -367,9 +366,7 @@ struct amdgpu_vcn_decode_buffer {
        uint32_t valid_buf_flag;
        uint32_t msg_buffer_address_hi;
        uint32_t msg_buffer_address_lo;
-       uint32_t session_context_buffer_address_hi;
-       uint32_t session_context_buffer_address_lo;
-       uint32_t pad[28];
+       uint32_t pad[30];
 };

 #define VCN_BLOCK_ENCODE_DISABLE_MASK 0x80
--
2.25.1