* [PATCH 1/2] Revert "drm/amdgpu: update kernel vcn ring test"
@ 2023-07-13 5:19 Saleemkhan Jamadar
2023-07-13 5:19 ` [PATCH 2/2] Revert "drm/amdgpu:update " Saleemkhan Jamadar
2023-07-13 16:52 ` [PATCH 1/2] Revert "drm/amdgpu: update " Alex Deucher
0 siblings, 2 replies; 5+ messages in thread
From: Saleemkhan Jamadar @ 2023-07-13 5:19 UTC (permalink / raw)
To: saleemkhan.jamadar, amd-gfx, marek.olsak, christian.koenig,
leo.liu, veerabadhran.gopalakrishnan
Cc: sathishkumar.sundararaju
VCN FW depncencies revert it to unblock others
This reverts commit d0edfbe8bc2d18ede8f805c6eb71c63e0b40c1da.
Signed-off-by: Saleemkhan Jamadar <saleemkhan.jamadar@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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] Revert "drm/amdgpu:update kernel vcn ring test"
2023-07-13 5:19 [PATCH 1/2] Revert "drm/amdgpu: update kernel vcn ring test" Saleemkhan Jamadar
@ 2023-07-13 5:19 ` Saleemkhan Jamadar
2023-07-13 5:29 ` Gopalakrishnan, Veerabadhran (Veera)
2023-07-13 16:52 ` [PATCH 1/2] Revert "drm/amdgpu: update " Alex Deucher
1 sibling, 1 reply; 5+ messages in thread
From: Saleemkhan Jamadar @ 2023-07-13 5:19 UTC (permalink / raw)
To: saleemkhan.jamadar, amd-gfx, marek.olsak, christian.koenig,
leo.liu, veerabadhran.gopalakrishnan
Cc: sathishkumar.sundararaju
VCN FW depncencies revert it to unblock others
This reverts commit ce085b8068e1071b0068f9a5dee78c97ef587022.
Signed-off-by: Saleemkhan Jamadar <saleemkhan.jamadar@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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* RE: [PATCH 2/2] Revert "drm/amdgpu:update kernel vcn ring test"
2023-07-13 5:19 ` [PATCH 2/2] Revert "drm/amdgpu:update " Saleemkhan Jamadar
@ 2023-07-13 5:29 ` Gopalakrishnan, Veerabadhran (Veera)
0 siblings, 0 replies; 5+ messages in thread
From: Gopalakrishnan, Veerabadhran (Veera) @ 2023-07-13 5:29 UTC (permalink / raw)
To: Jamadar, Saleemkhan, amd-gfx, Olsak, Marek, Koenig, Christian, Liu, Leo
Cc: Sundararaju, Sathishkumar
[AMD Official Use Only - General]
The revert patch set is looking good.
Acked-by: Veerabadhran Gopalakrishnan <Veerabadhran.Gopalakrishnan@amd.com>
-----Original Message-----
From: Jamadar, Saleemkhan <Saleemkhan.Jamadar@amd.com>
Sent: Thursday, July 13, 2023 10:50 AM
To: Jamadar, Saleemkhan <Saleemkhan.Jamadar@amd.com>; amd-gfx@lists.freedesktop.org; Olsak, Marek <Marek.Olsak@amd.com>; Koenig, Christian <Christian.Koenig@amd.com>; Liu, Leo <Leo.Liu@amd.com>; Gopalakrishnan, Veerabadhran (Veera) <Veerabadhran.Gopalakrishnan@amd.com>
Cc: Sundararaju, Sathishkumar <Sathishkumar.Sundararaju@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@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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] Revert "drm/amdgpu: update kernel vcn ring test"
2023-07-13 5:19 [PATCH 1/2] Revert "drm/amdgpu: update kernel vcn ring test" Saleemkhan Jamadar
2023-07-13 5:19 ` [PATCH 2/2] Revert "drm/amdgpu:update " Saleemkhan Jamadar
@ 2023-07-13 16:52 ` Alex Deucher
2023-07-14 4:12 ` Jamadar, Saleemkhan
1 sibling, 1 reply; 5+ messages in thread
From: Alex Deucher @ 2023-07-13 16:52 UTC (permalink / raw)
To: Saleemkhan Jamadar
Cc: sathishkumar.sundararaju, veerabadhran.gopalakrishnan,
marek.olsak, amd-gfx, leo.liu, christian.koenig
On Thu, Jul 13, 2023 at 1:20 AM Saleemkhan Jamadar
<saleemkhan.jamadar@amd.com> wrote:
>
> VCN FW depncencies revert it to unblock others
Alternatively, you could fix it by adding the appropriate firmware
version checks if that is the underlying issue.
Alex
>
> This reverts commit d0edfbe8bc2d18ede8f805c6eb71c63e0b40c1da.
>
> Signed-off-by: Saleemkhan Jamadar <saleemkhan.jamadar@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
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* RE: [PATCH 1/2] Revert "drm/amdgpu: update kernel vcn ring test"
2023-07-13 16:52 ` [PATCH 1/2] Revert "drm/amdgpu: update " Alex Deucher
@ 2023-07-14 4:12 ` Jamadar, Saleemkhan
0 siblings, 0 replies; 5+ messages in thread
From: Jamadar, Saleemkhan @ 2023-07-14 4:12 UTC (permalink / raw)
To: Alex Deucher
Cc: Sundararaju, Sathishkumar, Gopalakrishnan, Veerabadhran (Veera),
Olsak, Marek, amd-gfx, Liu, Leo, Koenig, Christian
[AMD Official Use Only - General]
Hi Alex ,
Revert changes are merged, will rework on changes and submit.
-----Original Message-----
From: Alex Deucher <alexdeucher@gmail.com>
Sent: Thursday, July 13, 2023 10:22 PM
To: Jamadar, Saleemkhan <Saleemkhan.Jamadar@amd.com>
Cc: amd-gfx@lists.freedesktop.org; Olsak, Marek <Marek.Olsak@amd.com>; Koenig, Christian <Christian.Koenig@amd.com>; Liu, Leo <Leo.Liu@amd.com>; Gopalakrishnan, Veerabadhran (Veera) <Veerabadhran.Gopalakrishnan@amd.com>; Sundararaju, Sathishkumar <Sathishkumar.Sundararaju@amd.com>
Subject: Re: [PATCH 1/2] Revert "drm/amdgpu: update kernel vcn ring test"
On Thu, Jul 13, 2023 at 1:20 AM Saleemkhan Jamadar <saleemkhan.jamadar@amd.com> wrote:
>
> VCN FW depncencies revert it to unblock others
Alternatively, you could fix it by adding the appropriate firmware version checks if that is the underlying issue.
Alex
>
> This reverts commit d0edfbe8bc2d18ede8f805c6eb71c63e0b40c1da.
>
> Signed-off-by: Saleemkhan Jamadar <saleemkhan.jamadar@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
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-07-14 4:12 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-07-13 5:19 [PATCH 1/2] Revert "drm/amdgpu: update kernel vcn ring test" Saleemkhan Jamadar
2023-07-13 5:19 ` [PATCH 2/2] Revert "drm/amdgpu:update " Saleemkhan Jamadar
2023-07-13 5:29 ` Gopalakrishnan, Veerabadhran (Veera)
2023-07-13 16:52 ` [PATCH 1/2] Revert "drm/amdgpu: update " Alex Deucher
2023-07-14 4:12 ` Jamadar, Saleemkhan
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.