* [PATCH 1/2] drm/amdgpu:update kernel vcn ring test
@ 2023-07-11 17:47 Saleemkhan Jamadar
2023-07-11 17:47 ` [PATCH 2/2] drm/amdgpu: update " Saleemkhan Jamadar
0 siblings, 1 reply; 3+ messages in thread
From: Saleemkhan Jamadar @ 2023-07-11 17:47 UTC (permalink / raw)
To: saleemkhan.jamadar, amd-gfx, christian.koenig, leo.liu,
veerabadhran.gopalakrishnan
Cc: sathishkumar.sundararaju, srinath.rao
add session context buffer to decoder ring test.
v5 - clear the session ct buffer (Christian)
v4 - data type, explain change of ib size change (Christian)
v3 - indent and v2 changes correction. (Christian)
v2 - put the buffer at the end of the IB (Christian)
Signed-off-by: Saleemkhan Jamadar <saleemkhan.jamadar@amd.com>
Acked-by: Leo Liu <leo.liu@amd.com>
Acked-by: Christian König <christian.koenig@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 13 +++++++++++--
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 5 ++++-
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
index 4e1256af80b6..8966ffb2f4a0 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
@@ -591,13 +591,15 @@ static int amdgpu_vcn_dec_get_create_msg(struct amdgpu_ring *ring, uint32_t hand
int r, i;
memset(ib, 0, sizeof(*ib));
- r = amdgpu_ib_get(adev, NULL, AMDGPU_GPU_PAGE_SIZE * 2,
+ /* 34 pages : 128KiB session context buffer size and 8KiB ib msg */
+ r = amdgpu_ib_get(adev, NULL, AMDGPU_GPU_PAGE_SIZE * 34,
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);
@@ -626,13 +628,15 @@ static int amdgpu_vcn_dec_get_destroy_msg(struct amdgpu_ring *ring, uint32_t han
int r, i;
memset(ib, 0, sizeof(*ib));
- r = amdgpu_ib_get(adev, NULL, AMDGPU_GPU_PAGE_SIZE * 2,
+ /* 34 pages : 128KiB session context buffer size and 8KiB ib msg */
+ r = amdgpu_ib_get(adev, NULL, AMDGPU_GPU_PAGE_SIZE * 34,
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);
@@ -718,6 +722,7 @@ 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;
@@ -748,6 +753,10 @@ 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 1f1d7dc94f90..ba5fefd74197 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h
@@ -171,6 +171,7 @@
#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)
@@ -366,7 +367,9 @@ struct amdgpu_vcn_decode_buffer {
uint32_t valid_buf_flag;
uint32_t msg_buffer_address_hi;
uint32_t msg_buffer_address_lo;
- uint32_t pad[30];
+ uint32_t session_context_buffer_address_hi;
+ uint32_t session_context_buffer_address_lo;
+ uint32_t pad[28];
};
#define VCN_BLOCK_ENCODE_DISABLE_MASK 0x80
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] drm/amdgpu: update kernel vcn ring test
2023-07-11 17:47 [PATCH 1/2] drm/amdgpu:update kernel vcn ring test Saleemkhan Jamadar
@ 2023-07-11 17:47 ` Saleemkhan Jamadar
0 siblings, 0 replies; 3+ messages in thread
From: Saleemkhan Jamadar @ 2023-07-11 17:47 UTC (permalink / raw)
To: saleemkhan.jamadar, amd-gfx, christian.koenig, leo.liu,
veerabadhran.gopalakrishnan
Cc: sathishkumar.sundararaju, srinath.rao
add session context buffer to decoder ring test for vcn v1 to v3.
v3 - correct the cmd for sesssion ctx buf
v2 - add the buffer into IB (Leo liu)
Signed-off-by: Saleemkhan Jamadar <saleemkhan.jamadar@amd.com>
Reviewed-by: Leo Liu <leo.liu@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 25 ++++++++++++++++++-------
1 file changed, 18 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
index 8966ffb2f4a0..5c2aa925dd79 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
@@ -539,6 +539,7 @@ 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;
@@ -552,13 +553,23 @@ static int amdgpu_vcn_dec_send_msg(struct amdgpu_ring *ring,
goto err;
ib = &job->ibs[0];
- 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->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[i] = PACKET0(adev->vcn.internal.nop, 0);
ib->ptr[i+1] = 0;
}
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] drm/amdgpu:update kernel vcn ring test
2023-06-26 14:50 [PATCH 1/2] drm/amdgpu:update " Saleemkhan Jamadar
@ 2023-06-26 14:50 ` Saleemkhan Jamadar
0 siblings, 0 replies; 3+ messages in thread
From: Saleemkhan Jamadar @ 2023-06-26 14:50 UTC (permalink / raw)
To: saleemkhan.jamadar, amd-gfx, leo.liu,
veerabadhran.gopalakrishnan, sathishkumar.sundararaju
Cc: srinath.rao
add session context buffer to decoder ring test fro vcn v1 to v3.
Signed-off-by: Saleemkhan Jamadar <saleemkhan.jamadar@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 43 ++++++++++++++++++++++---
1 file changed, 38 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
index 04daaaf6ab34..3e9c023e6c42 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
@@ -518,9 +518,11 @@ int amdgpu_vcn_dec_sw_ring_test_ring(struct amdgpu_ring *ring)
static int amdgpu_vcn_dec_send_msg(struct amdgpu_ring *ring,
struct amdgpu_ib *ib_msg,
- struct dma_fence **fence)
+ struct dma_fence **fence,
+ uint64_t session_ctx_buf_gaddr)
{
u64 addr = AMDGPU_GPU_PAGE_ALIGN(ib_msg->gpu_addr);
+ struct amdgpu_vcn_decode_buffer *decode_buffer = NULL;
struct amdgpu_device *adev = ring->adev;
struct dma_fence *f = NULL;
struct amdgpu_job *job;
@@ -534,6 +536,22 @@ 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++] = sizeof(struct amdgpu_vcn_decode_buffer) + 8;
+ ib->ptr[ib->length_dw++] = cpu_to_le32(AMDGPU_VCN_IB_FLAG_DECODE_BUFFER);
+ decode_buffer = (struct amdgpu_vcn_decode_buffer *)&(ib->ptr[ib->length_dw]);
+ ib->length_dw += sizeof(struct amdgpu_vcn_decode_buffer) / 4;
+ memset(decode_buffer, 0, sizeof(struct amdgpu_vcn_decode_buffer));
+
+ if (session_ctx_buf_gaddr) {
+ decode_buffer->valid_buf_flag |=
+ cpu_to_le32(AMDGPU_VCN_CMD_FLAG_SESSION_CONTEXT_BUFFER);
+ decode_buffer->session_context_buffer_address_hi =
+ cpu_to_le32(session_ctx_buf_gaddr >> 32);
+ decode_buffer->session_context_buffer_address_lo =
+ cpu_to_le32(session_ctx_buf_gaddr);
+ }
+
ib->ptr[0] = PACKET0(adev->vcn.internal.data0, 0);
ib->ptr[1] = addr;
ib->ptr[2] = PACKET0(adev->vcn.internal.data1, 0);
@@ -544,7 +562,7 @@ static int amdgpu_vcn_dec_send_msg(struct amdgpu_ring *ring,
ib->ptr[i] = PACKET0(adev->vcn.internal.nop, 0);
ib->ptr[i+1] = 0;
}
- ib->length_dw = 16;
+ ib->length_dw += 16;
r = amdgpu_job_submit_direct(job, ring, &f);
if (r)
@@ -631,20 +649,34 @@ int amdgpu_vcn_dec_ring_test_ib(struct amdgpu_ring *ring, long timeout)
{
struct dma_fence *fence = NULL;
struct amdgpu_ib ib;
+ struct amdgpu_bo *session_ctx_buf = NULL;
+ void *cpu_addr = NULL;
+ uint64_t gpu_addr = 0;
long r;
+ r = amdgpu_bo_create_kernel(ring->adev, 128*1024, PAGE_SIZE,
+ AMDGPU_GEM_DOMAIN_VRAM |
+ AMDGPU_GEM_DOMAIN_GTT,
+ &session_ctx_buf,
+ &gpu_addr,
+ &cpu_addr);
+ if (r) {
+ dev_err(ring->adev->dev, "VCN ib test:%ld failed to allocate session ctx bo\n", r);
+ return r;
+ }
+
r = amdgpu_vcn_dec_get_create_msg(ring, 1, &ib);
if (r)
goto error;
- r = amdgpu_vcn_dec_send_msg(ring, &ib, NULL);
+ r = amdgpu_vcn_dec_send_msg(ring, &ib, NULL, gpu_addr);
if (r)
goto error;
r = amdgpu_vcn_dec_get_destroy_msg(ring, 1, &ib);
if (r)
goto error;
- r = amdgpu_vcn_dec_send_msg(ring, &ib, &fence);
+ r = amdgpu_vcn_dec_send_msg(ring, &ib, &fence, gpu_addr);
if (r)
goto error;
@@ -656,6 +688,7 @@ int amdgpu_vcn_dec_ring_test_ib(struct amdgpu_ring *ring, long timeout)
dma_fence_put(fence);
error:
+ amdgpu_bo_free_kernel(&session_ctx_buf, &gpu_addr, &cpu_addr);
return r;
}
@@ -692,7 +725,7 @@ static void amdgpu_vcn_unified_ring_ib_checksum(uint32_t **ib_checksum,
static int amdgpu_vcn_dec_sw_send_msg(struct amdgpu_ring *ring,
struct amdgpu_ib *ib_msg,
struct dma_fence **fence,
- uint64_t session_ctx_buf_gaddr)
+ uint64_t session_ctx_buf_gaddr)
{
struct amdgpu_vcn_decode_buffer *decode_buffer = NULL;
unsigned int ib_size_dw = 64;
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-07-11 17:48 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-07-11 17:47 [PATCH 1/2] drm/amdgpu:update kernel vcn ring test Saleemkhan Jamadar
2023-07-11 17:47 ` [PATCH 2/2] drm/amdgpu: update " Saleemkhan Jamadar
-- strict thread matches above, loose matches on Subject: below --
2023-06-26 14:50 [PATCH 1/2] drm/amdgpu:update " Saleemkhan Jamadar
2023-06-26 14:50 ` [PATCH 2/2] " Saleemkhan Jamadar
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.