drm/amdgpu/vcn: Move RDECODE_* to amdgpu_vcn.h
Subsystems (2)
PATCH v3 1/3 drm/amdgpu/vcn: Move RDECODE_* to amdgpu_vcn.h
These defines can be shared. Move them and prefix with VCN_DEC_ instead.
---
v3: Renamed to VCN_DEC_
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 3 +++ drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 7 ++----- drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 7 ++----- drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c | 3 --- 4 files changed, 7 insertions(+), 13 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h +3 -0
@@ -57,6 +57,9 @@#define VCN_DEC_SW_CMD_REG_WRITE 0x0000000b#define VCN_DEC_SW_CMD_REG_WAIT 0x0000000c +#define VCN_DEC_MSG_CREATE 0x00000000 +#define VCN_DEC_MESSAGE_CREATE 0x00000001 +#define VCN_ENC_CMD_NO_OP 0x00000000#define VCN_ENC_CMD_END 0x00000001#define VCN_ENC_CMD_IB 0x00000002
drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c +2 -5
@@ -58,9 +58,6 @@#define VCN_INSTANCES_SIENNA_CICHLID 2#define DEC_SW_RING_ENABLED FALSE -#define RDECODE_MSG_CREATE 0x00000000 -#define RDECODE_MESSAGE_CREATE 0x00000001 -static const struct amdgpu_hwip_reg_entry vcn_reg_list_3_0[] = {SOC15_REG_ENTRY_STR (VCN ,0 , mmUVD_POWER_STATUS),SOC15_REG_ENTRY_STR (VCN ,0 , mmUVD_STATUS),
@@ -1957,7 +1954,7 @@ static int vcn_v3_0_dec_msg(struct amdgpu_cs_parser *p, struct amdgpu_job *job, goto out; } -if (msg[3 ] !=RDECODE_MSG_CREATE ) +if (msg[3 ] !=VCN_DEC_MSG_CREATE ) goto out; len_dw = msg[1 ] /4 ;
@@ -1973,7 +1970,7 @@ static int vcn_v3_0_dec_msg(struct amdgpu_cs_parser *p, struct amdgpu_job *job,for (i =0 , msg = &msg[6 ]; i < num_buffers; ++i, msg +=4 ) {uint32_t offset, size, *create; -if (msg[0 ] !=RDECODE_MESSAGE_CREATE ) +if (msg[0 ] !=VCN_DEC_MESSAGE_CREATE )continue ; offset = msg[1 ];
drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c +2 -5
@@ -50,9 +50,6 @@#define VCN_HARVEST_MMSCH 0 -#define RDECODE_MSG_CREATE 0x00000000 -#define RDECODE_MESSAGE_CREATE 0x00000001 -static const struct amdgpu_hwip_reg_entry vcn_reg_list_4_0[] = {SOC15_REG_ENTRY_STR (VCN ,0 , regUVD_POWER_STATUS),SOC15_REG_ENTRY_STR (VCN ,0 , regUVD_STATUS),
@@ -1874,7 +1871,7 @@ static int vcn_v4_0_dec_msg(struct amdgpu_cs_parser *p, struct amdgpu_job *job, goto out; } -if (msg[3 ] !=RDECODE_MSG_CREATE ) +if (msg[3 ] !=VCN_DEC_MSG_CREATE ) goto out; len_dw = msg[1 ] /4 ;
@@ -1890,7 +1887,7 @@ static int vcn_v4_0_dec_msg(struct amdgpu_cs_parser *p, struct amdgpu_job *job,for (i =0 , msg = &msg[6 ]; i < num_buffers; ++i, msg +=4 ) {uint32_t offset, size, *create; -if (msg[0 ] !=RDECODE_MESSAGE_CREATE ) +if (msg[0 ] !=VCN_DEC_MESSAGE_CREATE )continue ; offset = msg[1 ];
drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c +0 -3
@@ -50,9 +50,6 @@#define VCN_HARVEST_MMSCH 0 -#define RDECODE_MSG_CREATE 0x00000000 -#define RDECODE_MESSAGE_CREATE 0x00000001 -static const struct amdgpu_hwip_reg_entry vcn_reg_list_4_0_5[] = {SOC15_REG_ENTRY_STR (VCN ,0 , regUVD_POWER_STATUS),SOC15_REG_ENTRY_STR (VCN ,0 , regUVD_STATUS),
Signature · 1 line
2.53.0
PATCH v3 2/3 drm/amdgpu/vcn4.0.5: Remove unused define
As part of the previous cleanup, this was noticed to never be used.
--- drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c | 2 -- 1 file changed, 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c +0 -2
@@ -48,8 +48,6 @@#define VCN1_VID_SOC_ADDRESS_3_0 (0x48300 + 0x38000)#define VCN1_AON_SOC_ADDRESS_3_0 (0x48000 + 0x38000) -#define VCN_HARVEST_MMSCH 0 -static const struct amdgpu_hwip_reg_entry vcn_reg_list_4_0_5[] = {SOC15_REG_ENTRY_STR (VCN ,0 , regUVD_POWER_STATUS),SOC15_REG_ENTRY_STR (VCN ,0 , regUVD_STATUS),
Signature · 1 line
2.53.0
Re: [PATCH v3 2/3] drm/amdgpu/vcn4.0.5: Remove unused define
Quoted 3 lines · Benjamin Cheng
As part of the previous cleanup, this was noticed to never be used.
Signed-off-by Benjamin Cheng <[email protected]>
Quoted 17 lines
--- drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c | 2 -- 1 file changed, 2 deletions(-)drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c +0
-2@@ -48,8 +48,6 @@#define VCN1_VID_SOC_ADDRESS_3_0 (0x48300 + 0x38000)#define VCN1_AON_SOC_ADDRESS_3_0 (0x48000 + 0x38000) -#define VCN_HARVEST_MMSCH 0 -static const struct amdgpu_hwip_reg_entry vcn_reg_list_4_0_5[] = {SOC15_REG_ENTRY_STR (VCN ,0 , regUVD_POWER_STATUS),SOC15_REG_ENTRY_STR (VCN ,0 , regUVD_STATUS),
RE: [PATCH v3 2/3] drm/amdgpu/vcn4.0.5: Remove unused define
In reply to Benjamin Cheng[AMD Official Use Only - AMD Internal Distribution Only]
Thanks,
Ruijing
-----Original Message-----
From: Benjamin Cheng <[email protected]>
Sent: Wednesday, April 8, 2026 8:54 AM
To: Deucher, Alexander <[email protected]>; Koenig, Christian <[email protected]>; Liu, Leo <[email protected]>; [email protected]
Cc: Wu, David <[email protected]>; Dong, Ruijing <[email protected]>; Cheng, Benjamin <[email protected]>
Subject: [PATCH v3 2/3] drm/amdgpu/vcn4.0.5: Remove unused define
As part of the previous cleanup, this was noticed to never be used.
--- drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c | 2 -- 1 file changed, 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c +0 -2
@@ -48,8 +48,6 @@#define VCN1_VID_SOC_ADDRESS_3_0 (0x48300 + 0x38000)#define VCN1_AON_SOC_ADDRESS_3_0 (0x48000 + 0x38000) -#define VCN_HARVEST_MMSCH 0 -static const struct amdgpu_hwip_reg_entry vcn_reg_list_4_0_5[] = {SOC15_REG_ENTRY_STR (VCN ,0 , regUVD_POWER_STATUS),SOC15_REG_ENTRY_STR (VCN ,0 , regUVD_STATUS),
--
2.53.0
PATCH v3 3/3 drm/amdgpu/vcn: Factor out vcn_v{3,4}_0_dec_msg
In reply to Benjamin ChengBoth vcn_v3_0 and vcn_v4_0 use the same interface, so unify the code.
---
v2: Moved RDECODE_* defines to header in patch #1.
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 100 +++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 5 ++ drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 102 +----------------------- drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 101 +---------------------- 4 files changed, 109 insertions(+), 199 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +100 -0
@@ -1641,3 +1641,103 @@ void amdgpu_vcn_print_ip_state(struct amdgpu_ip_block *ip_block, struct drm_prin } } } + +int amdgpu_vcn_dec_msg_limit_sched (struct amdgpu_cs_parser *p, +struct amdgpu_job *job,uint64_t addr, +int (*limit_sched)(struct amdgpu_cs_parser *, +struct amdgpu_job *)) +{ +struct ttm_operation_ctx ctx = { false, false }; +struct amdgpu_device *adev = p->adev; +struct amdgpu_bo_va_mapping *map; +uint32_t *msg, num_buffers, len_dw; +struct amdgpu_bo *bo; +uint64_t start, end; +unsigned int i; +void *ptr; +int r; + + addr &=AMDGPU_GMC_HOLE_MASK ; + r =amdgpu_cs_find_mapping (p, addr, &bo, &map); +if (r) { +DRM_ERROR ("Can't find BO for addr 0x%08llx\n" , addr); +return r; + } + + start = map->start *AMDGPU_GPU_PAGE_SIZE ; + end = (map->last +1 ) *AMDGPU_GPU_PAGE_SIZE ; +if (addr &0x7 ) { +DRM_ERROR ("VCN messages must be 8 byte aligned!\n" ); +return -EINVAL ; + } + +if (end - addr <16 ) { +DRM_ERROR ("VCN messages must be at least 4 DWORDs!\n" ); +return -EINVAL ; + } + + bo->flags |=AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED ; +amdgpu_bo_placement_from_domain (bo, bo->allowed_domains); + r =ttm_bo_validate (&bo->tbo, &bo->placement, &ctx); +if (r) { +DRM_ERROR ("Failed validating the VCN message BO (%d)!\n" , r); +return r; + } + + r =amdgpu_bo_kmap (bo, &ptr); +if (r) { +DRM_ERROR ("Failed mapping the VCN message (%d)!\n" , r); +return r; + } + + msg = ptr + addr - start; + +if (msg[1 ] > end - addr) { +DRM_ERROR ("VCN message header does not fit in BO!\n" ); + r = -EINVAL ; + goto out; + } + +if (msg[3 ] !=VCN_DEC_MSG_CREATE ) + goto out; + + len_dw = msg[1 ] /4 ; + num_buffers = msg[2 ]; + +/* Verify that all indices fit within the claimed length. Each index is 4 DWORDs */ +if (num_buffers > len_dw ||6 + num_buffers *4 > len_dw) { +DRM_ERROR ("VCN message has too many buffers!\n" ); + r = -EINVAL ; + goto out; + } + +for (i =0 , msg = &msg[6 ]; i < num_buffers; ++i, msg +=4 ) { +uint32_t offset, size, *create; + +if (msg[0 ] !=VCN_DEC_MESSAGE_CREATE ) +continue ; + + offset = msg[1 ]; + size = msg[2 ]; + +if (size <4 || offset + size > end - addr) { +DRM_ERROR ("VCN message buffer exceeds BO bounds!\n" ); + r = -EINVAL ; + goto out; + } + + create = ptr + addr + offset - start; + +/* H264, HEVC and VP9 can run on any instance */ +if (create[0 ] ==0x7 || create[0 ] ==0x10 || create[0 ] ==0x11 ) +continue ; + + r =limit_sched (p, job); +if (r) + goto out; + } + +out: +amdgpu_bo_kunmap (bo); +return r; +}
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h +5 -0
@@ -573,4 +573,9 @@ void amdgpu_vcn_print_ip_state(struct amdgpu_ip_block *ip_block, struct drm_prinvoid amdgpu_vcn_get_profile (struct amdgpu_device *adev);void amdgpu_vcn_put_profile (struct amdgpu_device *adev); +int amdgpu_vcn_dec_msg_limit_sched (struct amdgpu_cs_parser *p,struct amdgpu_job *job, +uint64_t addr, +int (*limit_sched)(struct amdgpu_cs_parser *, +struct amdgpu_job *)); +#endif
drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c +2 -100
114 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c +2 -99
113 lines not on this page · raw message
Signature · 1 line
2.53.0
RE: [PATCH v3 3/3] drm/amdgpu/vcn: Factor out vcn_v{3,4}_0_dec_msg
[AMD Official Use Only - AMD Internal Distribution Only]
The series is:
Quoted 426 lines
-----Original Message-----
From: Benjamin Cheng <[email protected]>
Sent: April 8, 2026 8:54 AM
To: Deucher, Alexander <[email protected]>; Koenig, Christian <[email protected]>; Liu, Leo <[email protected]>; amd- [email protected]
Cc: Wu, David <[email protected]>; Dong, Ruijing <[email protected]>; Cheng, Benjamin <[email protected]>
Subject: [PATCH v3 3/3] drm/amdgpu/vcn: Factor out vcn_v{3,4}_0_dec_msgBoth
vcn_v3_0andvcn_v4_0use the same interface, so unify the code.Signed-off-by Benjamin Cheng <[email protected]>---
v2: Moved RDECODE_* defines to header in patch #1.drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 100 +++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 5 ++ drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 102 +----------------------- drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 101 +---------------------- 4 files changed, 109 insertions(+), 199 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +0
-0@@ -1641,3 +1641,103 @@ void amdgpu_vcn_print_ip_state(struct
amdgpu_ip_block*ip_block, structdrm_prin} }}
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +4
-0+ +int amdgpu_vcn_dec_msg_limit_sched(struct amdgpu_cs_parser *p, + struct amdgpu_job *job, uint64_t addr, + int (*limit_sched)(struct
amdgpu_cs_parser*,drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +28
-0+ struct amdgpu_job *)) +{ +struct ttm_operation_ctx ctx = { false, false }; +struct amdgpu_device *adev = p->adev; +struct amdgpu_bo_va_mapping *map; +uint32_t *msg, num_buffers, len_dw; +struct amdgpu_bo *bo; +uint64_t start, end; +unsigned int i; +void *ptr; +int r; + + addr &=AMDGPU_GMC_HOLE_MASK ; + r =amdgpu_cs_find_mapping (p, addr, &bo, &map); +if (r) { +DRM_ERROR ("Can't find BO for addr 0x%08llx\n" , addr); +return r; + } + + start = map->start *AMDGPU_GPU_PAGE_SIZE ; + end = (map->last +1 ) *AMDGPU_GPU_PAGE_SIZE ; +if (addr &0x7 ) { +DRM_ERROR ("VCN messages must be 8 byte aligned!\n" ); +return -EINVAL ; + } + +if (end - addr <16 ) { + DRM_ERROR("VCN messages must be at least 4DWORDs!\n");
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +8
-0+return -EINVAL ; + } + + bo->flags |=AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED ; +amdgpu_bo_placement_from_domain (bo, bo->allowed_domains); + r =ttm_bo_validate (&bo->tbo, &bo->placement, &ctx); +if (r) { + DRM_ERROR("Failed validating the VCN message BO(%d)!\n", r);
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +6
-0+return r; + } + + r =amdgpu_bo_kmap (bo, &ptr); +if (r) { + DRM_ERROR("Failed mapping the VCN message (%d)!\n",r);
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +18
-0+return r; + } + + msg = ptr + addr - start; + +if (msg[1 ] > end - addr) { +DRM_ERROR ("VCN message header does not fit in BO!\n" ); + r = -EINVAL ; + goto out; + } + +if (msg[3 ] !=VCN_DEC_MSG_CREATE ) + goto out; + + len_dw = msg[1 ] /4 ; + num_buffers = msg[2 ]; + +/* Verify that all indices fit within the claimed length. Each index is 4 DWORDs */
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +17
-0+if (num_buffers > len_dw ||6 + num_buffers *4 > len_dw) { +DRM_ERROR ("VCN message has too many buffers!\n" ); + r = -EINVAL ; + goto out; + } + +for (i =0 , msg = &msg[6 ]; i < num_buffers; ++i, msg +=4 ) { +uint32_t offset, size, *create; + +if (msg[0 ] !=VCN_DEC_MESSAGE_CREATE ) +continue ; + + offset = msg[1 ]; + size = msg[2 ]; + +if (size <4 || offset + size > end - addr) { + DRM_ERROR("VCN message buffer exceeds BObounds!\n");
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +19
-0+ r = -EINVAL ; + goto out; + } + + create = ptr + addr + offset - start; + +/* H264, HEVC and VP9 can run on any instance */ +if (create[0 ] ==0x7 || create[0 ] ==0x10 || create[0 ] ==0x11 ) +continue ; + + r =limit_sched (p, job); +if (r) + goto out; + } + +out: +amdgpu_bo_kunmap (bo); +return r; +}drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h +0
-0@@ -573,4 +573,9 @@ void amdgpu_vcn_print_ip_state(struct
amdgpu_ip_block*ip_block, structdrm_prin
voidamdgpu_vcn_get_profile(struct amdgpu_device *adev); voidamdgpu_vcn_put_profile(struct amdgpu_device *adev);+int amdgpu_vcn_dec_msg_limit_sched(struct
amdgpu_cs_parser*p, structamdgpu_job*job,drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h +2
-0+ uint64_t addr, + int (*limit_sched)(struct
amdgpu_cs_parser*,drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h +2
-0+ struct amdgpu_job *)); +#endif drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c +0
-37@@ -1900,104 +1900,6 @@ static int vcn_v3_0_limit_sched(structamdgpu_cs_parser *p, return 0; } -static int vcn_v3_0_dec_msg (struct amdgpu_cs_parser *p,struct amdgpu_job *job, -uint64_t addr) -{ -struct ttm_operation_ctx ctx = { false, false }; -struct amdgpu_device *adev = p->adev; -struct amdgpu_bo_va_mapping *map; -uint32_t *msg, num_buffers, len_dw; -struct amdgpu_bo *bo; -uint64_t start, end; -unsigned int i; -void *ptr; -int r; - - addr &=AMDGPU_GMC_HOLE_MASK ; - r =amdgpu_cs_find_mapping (p, addr, &bo, &map); -if (r) { -DRM_ERROR ("Can't find BO for addr 0x%08Lx\n" , addr); -return r; - } - - start = map->start *AMDGPU_GPU_PAGE_SIZE ; - end = (map->last +1 ) *AMDGPU_GPU_PAGE_SIZE ; -if (addr &0x7 ) { -DRM_ERROR ("VCN messages must be 8 byte aligned!\n" ); -return -EINVAL ; - } - -if (end - addr <16 ) { -DRM_ERROR ("VCN messages must be at least 4 DWORDs!\n"); -return -EINVAL ; - } - - bo->flags |=AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED ; -amdgpu_bo_placement_from_domain (bo, bo->allowed_domains); - r =ttm_bo_validate (&bo->tbo, &bo->placement, &ctx); -if (r) { - DRM_ERROR("Failed validating the VCN message BO(%d)!\n", r);
drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c +0
-6-return r; - } - - r =amdgpu_bo_kmap (bo, &ptr); -if (r) { - DRM_ERROR("Failed mapping the VCN message (%d)!\n",r);
drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c +0
-18-return r; - } - - msg = ptr + addr - start; - -if (msg[1 ] > end - addr) { -DRM_ERROR ("VCN message header does not fit in BO!\n" ); - r = -EINVAL ; - goto out; - } - -if (msg[3 ] !=VCN_DEC_MSG_CREATE ) - goto out; - - len_dw = msg[1 ] /4 ; - num_buffers = msg[2 ]; - -/* Verify that all indices fit within the claimed length. Each index is 4 DWORDs */
drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c +0
-17-if (num_buffers > len_dw ||6 + num_buffers *4 > len_dw) { -DRM_ERROR ("VCN message has too many buffers!\n" ); - r = -EINVAL ; - goto out; - } - -for (i =0 , msg = &msg[6 ]; i < num_buffers; ++i, msg +=4 ) { -uint32_t offset, size, *create; - -if (msg[0 ] !=VCN_DEC_MESSAGE_CREATE ) -continue ; - - offset = msg[1 ]; - size = msg[2 ]; - -if (size <4 || offset + size > end - addr) { - DRM_ERROR("VCN message buffer exceeds BObounds!\n");
drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c +0
-20- r = -EINVAL ; - goto out; - } - - create = ptr + addr + offset - start; - -/* H264, HEVC and VP9 can run on any instance */ -if (create[0 ] ==0x7 || create[0 ] ==0x10 || create[0 ] ==0x11 ) -continue ; - - r =vcn_v3_0_limit_sched (p, job); -if (r) - goto out; - } - -out: -amdgpu_bo_kunmap (bo); -return r; -} -static int vcn_v3_0_ring_patch_cs_in_place (struct amdgpu_cs_parser *p,struct amdgpu_job *job,struct amdgpu_ib *ib)@@ -2021,8 +1923,8 @@ static int vcn_v3_0_ring_patch_cs_in_place(structamdgpu_cs_parser *p, msg_hi = val; } else if (reg == PACKET0(p->adev->vcn.inst[ring-Quoted 1 line
me].internal.cmd, 0) &&
val == 0) {drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c +1
-2- r =vcn_v3_0_dec_msg (p, job, - ((u64 )msg_hi) <<32 | msg_lo); + r = amdgpu_vcn_dec_msg_limit_sched(p, job,((u64)msg_hi) << 32 |
msg_lo,
+vcn_v3_0_limit_sched); if (r) return r; }drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c +0
-37@@ -1817,104 +1817,6 @@ static int vcn_v4_0_limit_sched(structamdgpu_cs_parser *p, return 0; } -static int vcn_v4_0_dec_msg (struct amdgpu_cs_parser *p,struct amdgpu_job *job, -uint64_t addr) -{ -struct ttm_operation_ctx ctx = { false, false }; -struct amdgpu_device *adev = p->adev; -struct amdgpu_bo_va_mapping *map; -uint32_t *msg, num_buffers, len_dw; -struct amdgpu_bo *bo; -uint64_t start, end; -unsigned int i; -void *ptr; -int r; - - addr &=AMDGPU_GMC_HOLE_MASK ; - r =amdgpu_cs_find_mapping (p, addr, &bo, &map); -if (r) { -DRM_ERROR ("Can't find BO for addr 0x%08llx\n" , addr); -return r; - } - - start = map->start *AMDGPU_GPU_PAGE_SIZE ; - end = (map->last +1 ) *AMDGPU_GPU_PAGE_SIZE ; -if (addr &0x7 ) { -DRM_ERROR ("VCN messages must be 8 byte aligned!\n" ); -return -EINVAL ; - } - -if (end - addr <16 ) { -DRM_ERROR ("VCN messages must be at least 4 DWORDs!\n"); -return -EINVAL ; - } - - bo->flags |=AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED ; -amdgpu_bo_placement_from_domain (bo, bo->allowed_domains); - r =ttm_bo_validate (&bo->tbo, &bo->placement, &ctx); -if (r) { - DRM_ERROR("Failed validating the VCN message BO(%d)!\n", r);
drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c +0
-6-return r; - } - - r =amdgpu_bo_kmap (bo, &ptr); -if (r) { - DRM_ERROR("Failed mapping the VCN message (%d)!\n",r);
drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c +0
-18-return r; - } - - msg = ptr + addr - start; - -if (msg[1 ] > end - addr) { -DRM_ERROR ("VCN message header does not fit in BO!\n" ); - r = -EINVAL ; - goto out; - } - -if (msg[3 ] !=VCN_DEC_MSG_CREATE ) - goto out; - - len_dw = msg[1 ] /4 ; - num_buffers = msg[2 ]; - -/* Verify that all indices fit within the claimed length. Each index is 4 DWORDs */
drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c +0
-17-if (num_buffers > len_dw ||6 + num_buffers *4 > len_dw) { -DRM_ERROR ("VCN message has too many buffers!\n" ); - r = -EINVAL ; - goto out; - } - -for (i =0 , msg = &msg[6 ]; i < num_buffers; ++i, msg +=4 ) { -uint32_t offset, size, *create; - -if (msg[0 ] !=VCN_DEC_MESSAGE_CREATE ) -continue ; - - offset = msg[1 ]; - size = msg[2 ]; - -if (size <4 || offset + size > end - addr) { - DRM_ERROR("VCN message buffer exceeds BObounds!\n");
drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c +0
-20- r = -EINVAL ; - goto out; - } - - create = ptr + addr + offset - start; - -/* H264, HEVC and VP9 can run on any instance */ -if (create[0 ] ==0x7 || create[0 ] ==0x10 || create[0 ] ==0x11 ) -continue ; - - r =vcn_v4_0_limit_sched (p, job); -if (r) - goto out; - } - -out: -amdgpu_bo_kunmap (bo); -return r; -} -#define RADEON_VCN_ENGINE_TYPE_ENCODE (0x00000002)#define RADEON_VCN_ENGINE_TYPE_DECODE (0x00000003)#define RADEON_VCN_ENGINE_INFO (0x30000001 )@@ -1957,7 +1859,8 @@ static int vcn_v4_0_ring_patch_cs_in_place(structamdgpu_cs_parser *p, msg_buffer_addr = ((u64)amdgpu_ib_get_value(ib,idx + 7)) << 32 |
amdgpu_ib_get_value(ib, idx + 8);drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c +1
-1-return vcn_v4_0_dec_msg (p, job, msg_buffer_addr); + return amdgpu_vcn_dec_msg_limit_sched(p, job,
msg_buffer_addr,
+vcn_v4_0_limit_sched); } else if (val == RADEON_VCN_ENGINE_TYPE_ENCODE) { sidx = vcn_v4_0_enc_find_ib_param(ib, RENCODE_IB_PARAM_SESSION_INIT, idx); if (sidx >= 0 &&--
2.53.0
Re: [PATCH v3 3/3] drm/amdgpu/vcn: Factor out vcn_v{3,4}_0_dec_msg
In reply to Benjamin ChengQuoted 3 lines · Benjamin Cheng
Both
vcn_v3_0andvcn_v4_0use the same interface, so unify the code.Signed-off-by Benjamin Cheng <[email protected]>
Looks good of hand, but somebody from Leo's team should take a closer look.
Quoted 370 lines
---
v2: Moved RDECODE_* defines to header in patch #1.drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 100 +++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 5 ++ drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 102 +----------------------- drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 101 +---------------------- 4 files changed, 109 insertions(+), 199 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +100
-0@@ -1641,3 +1641,103 @@ void amdgpu_vcn_print_ip_state(struct amdgpu_ip_block *ip_block, struct drm_prin } } } + +int amdgpu_vcn_dec_msg_limit_sched (struct amdgpu_cs_parser *p, +struct amdgpu_job *job,uint64_t addr, +int (*limit_sched)(struct amdgpu_cs_parser *, +struct amdgpu_job *)) +{ +struct ttm_operation_ctx ctx = { false, false }; +struct amdgpu_device *adev = p->adev; +struct amdgpu_bo_va_mapping *map; +uint32_t *msg, num_buffers, len_dw; +struct amdgpu_bo *bo; +uint64_t start, end; +unsigned int i; +void *ptr; +int r; + + addr &=AMDGPU_GMC_HOLE_MASK ; + r =amdgpu_cs_find_mapping (p, addr, &bo, &map); +if (r) { +DRM_ERROR ("Can't find BO for addr 0x%08llx\n" , addr); +return r; + } + + start = map->start *AMDGPU_GPU_PAGE_SIZE ; + end = (map->last +1 ) *AMDGPU_GPU_PAGE_SIZE ; +if (addr &0x7 ) { +DRM_ERROR ("VCN messages must be 8 byte aligned!\n" ); +return -EINVAL ; + } + +if (end - addr <16 ) { +DRM_ERROR ("VCN messages must be at least 4 DWORDs!\n" ); +return -EINVAL ; + } + + bo->flags |=AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED ; +amdgpu_bo_placement_from_domain (bo, bo->allowed_domains); + r =ttm_bo_validate (&bo->tbo, &bo->placement, &ctx); +if (r) { +DRM_ERROR ("Failed validating the VCN message BO (%d)!\n" , r); +return r; + } + + r =amdgpu_bo_kmap (bo, &ptr); +if (r) { +DRM_ERROR ("Failed mapping the VCN message (%d)!\n" , r); +return r; + } + + msg = ptr + addr - start; + +if (msg[1 ] > end - addr) { +DRM_ERROR ("VCN message header does not fit in BO!\n" ); + r = -EINVAL ; + goto out; + } + +if (msg[3 ] !=VCN_DEC_MSG_CREATE ) + goto out; + + len_dw = msg[1 ] /4 ; + num_buffers = msg[2 ]; + +/* Verify that all indices fit within the claimed length. Each index is 4 DWORDs */ +if (num_buffers > len_dw ||6 + num_buffers *4 > len_dw) { +DRM_ERROR ("VCN message has too many buffers!\n" ); + r = -EINVAL ; + goto out; + } + +for (i =0 , msg = &msg[6 ]; i < num_buffers; ++i, msg +=4 ) { +uint32_t offset, size, *create; + +if (msg[0 ] !=VCN_DEC_MESSAGE_CREATE ) +continue ; + + offset = msg[1 ]; + size = msg[2 ]; + +if (size <4 || offset + size > end - addr) { +DRM_ERROR ("VCN message buffer exceeds BO bounds!\n" ); + r = -EINVAL ; + goto out; + } + + create = ptr + addr + offset - start; + +/* H264, HEVC and VP9 can run on any instance */ +if (create[0 ] ==0x7 || create[0 ] ==0x10 || create[0 ] ==0x11 ) +continue ; + + r =limit_sched (p, job); +if (r) + goto out; + } + +out: +amdgpu_bo_kunmap (bo); +return r; +}drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h +5
-0@@ -573,4 +573,9 @@ void amdgpu_vcn_print_ip_state(struct amdgpu_ip_block *ip_block, struct drm_prinvoid amdgpu_vcn_get_profile (struct amdgpu_device *adev);void amdgpu_vcn_put_profile (struct amdgpu_device *adev); +int amdgpu_vcn_dec_msg_limit_sched (struct amdgpu_cs_parser *p,struct amdgpu_job *job, +uint64_t addr, +int (*limit_sched)(struct amdgpu_cs_parser *, +struct amdgpu_job *)); +#endif drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c +2
-100@@ -1900,104 +1900,6 @@ static int vcn_v3_0_limit_sched(struct amdgpu_cs_parser *p,return 0 ; } -static int vcn_v3_0_dec_msg (struct amdgpu_cs_parser *p,struct amdgpu_job *job, -uint64_t addr) -{ -struct ttm_operation_ctx ctx = { false, false }; -struct amdgpu_device *adev = p->adev; -struct amdgpu_bo_va_mapping *map; -uint32_t *msg, num_buffers, len_dw; -struct amdgpu_bo *bo; -uint64_t start, end; -unsigned int i; -void *ptr; -int r; - - addr &=AMDGPU_GMC_HOLE_MASK ; - r =amdgpu_cs_find_mapping (p, addr, &bo, &map); -if (r) { -DRM_ERROR ("Can't find BO for addr 0x%08Lx\n" , addr); -return r; - } - - start = map->start *AMDGPU_GPU_PAGE_SIZE ; - end = (map->last +1 ) *AMDGPU_GPU_PAGE_SIZE ; -if (addr &0x7 ) { -DRM_ERROR ("VCN messages must be 8 byte aligned!\n" ); -return -EINVAL ; - } - -if (end - addr <16 ) { -DRM_ERROR ("VCN messages must be at least 4 DWORDs!\n" ); -return -EINVAL ; - } - - bo->flags |=AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED ; -amdgpu_bo_placement_from_domain (bo, bo->allowed_domains); - r =ttm_bo_validate (&bo->tbo, &bo->placement, &ctx); -if (r) { -DRM_ERROR ("Failed validating the VCN message BO (%d)!\n" , r); -return r; - } - - r =amdgpu_bo_kmap (bo, &ptr); -if (r) { -DRM_ERROR ("Failed mapping the VCN message (%d)!\n" , r); -return r; - } - - msg = ptr + addr - start; - -if (msg[1 ] > end - addr) { -DRM_ERROR ("VCN message header does not fit in BO!\n" ); - r = -EINVAL ; - goto out; - } - -if (msg[3 ] !=VCN_DEC_MSG_CREATE ) - goto out; - - len_dw = msg[1 ] /4 ; - num_buffers = msg[2 ]; - -/* Verify that all indices fit within the claimed length. Each index is 4 DWORDs */ -if (num_buffers > len_dw ||6 + num_buffers *4 > len_dw) { -DRM_ERROR ("VCN message has too many buffers!\n" ); - r = -EINVAL ; - goto out; - } - -for (i =0 , msg = &msg[6 ]; i < num_buffers; ++i, msg +=4 ) { -uint32_t offset, size, *create; - -if (msg[0 ] !=VCN_DEC_MESSAGE_CREATE ) -continue ; - - offset = msg[1 ]; - size = msg[2 ]; - -if (size <4 || offset + size > end - addr) { -DRM_ERROR ("VCN message buffer exceeds BO bounds!\n" ); - r = -EINVAL ; - goto out; - } - - create = ptr + addr + offset - start; - -/* H264, HEVC and VP9 can run on any instance */ -if (create[0 ] ==0x7 || create[0 ] ==0x10 || create[0 ] ==0x11 ) -continue ; - - r =vcn_v3_0_limit_sched (p, job); -if (r) - goto out; - } - -out: -amdgpu_bo_kunmap (bo); -return r; -} -static int vcn_v3_0_ring_patch_cs_in_place (struct amdgpu_cs_parser *p,struct amdgpu_job *job,struct amdgpu_ib *ib)@@ -2021,8 +1923,8 @@ static int vcn_v3_0_ring_patch_cs_in_place(struct amdgpu_cs_parser *p, msg_hi = val; }else if (reg ==PACKET0 (p->adev->vcn.inst[ring->me].internal.cmd,0 ) && val ==0 ) { - r =vcn_v3_0_dec_msg (p, job, - ((u64 )msg_hi) <<32 | msg_lo); + r =amdgpu_vcn_dec_msg_limit_sched (p, job, ((u64 )msg_hi) <<32 | msg_lo, + vcn_v3_0_limit_sched);if (r)return r; }drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c +2
-99@@ -1817,104 +1817,6 @@ static int vcn_v4_0_limit_sched(struct amdgpu_cs_parser *p,return 0 ; } -static int vcn_v4_0_dec_msg (struct amdgpu_cs_parser *p,struct amdgpu_job *job, -uint64_t addr) -{ -struct ttm_operation_ctx ctx = { false, false }; -struct amdgpu_device *adev = p->adev; -struct amdgpu_bo_va_mapping *map; -uint32_t *msg, num_buffers, len_dw; -struct amdgpu_bo *bo; -uint64_t start, end; -unsigned int i; -void *ptr; -int r; - - addr &=AMDGPU_GMC_HOLE_MASK ; - r =amdgpu_cs_find_mapping (p, addr, &bo, &map); -if (r) { -DRM_ERROR ("Can't find BO for addr 0x%08llx\n" , addr); -return r; - } - - start = map->start *AMDGPU_GPU_PAGE_SIZE ; - end = (map->last +1 ) *AMDGPU_GPU_PAGE_SIZE ; -if (addr &0x7 ) { -DRM_ERROR ("VCN messages must be 8 byte aligned!\n" ); -return -EINVAL ; - } - -if (end - addr <16 ) { -DRM_ERROR ("VCN messages must be at least 4 DWORDs!\n" ); -return -EINVAL ; - } - - bo->flags |=AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED ; -amdgpu_bo_placement_from_domain (bo, bo->allowed_domains); - r =ttm_bo_validate (&bo->tbo, &bo->placement, &ctx); -if (r) { -DRM_ERROR ("Failed validating the VCN message BO (%d)!\n" , r); -return r; - } - - r =amdgpu_bo_kmap (bo, &ptr); -if (r) { -DRM_ERROR ("Failed mapping the VCN message (%d)!\n" , r); -return r; - } - - msg = ptr + addr - start; - -if (msg[1 ] > end - addr) { -DRM_ERROR ("VCN message header does not fit in BO!\n" ); - r = -EINVAL ; - goto out; - } - -if (msg[3 ] !=VCN_DEC_MSG_CREATE ) - goto out; - - len_dw = msg[1 ] /4 ; - num_buffers = msg[2 ]; - -/* Verify that all indices fit within the claimed length. Each index is 4 DWORDs */ -if (num_buffers > len_dw ||6 + num_buffers *4 > len_dw) { -DRM_ERROR ("VCN message has too many buffers!\n" ); - r = -EINVAL ; - goto out; - } - -for (i =0 , msg = &msg[6 ]; i < num_buffers; ++i, msg +=4 ) { -uint32_t offset, size, *create; - -if (msg[0 ] !=VCN_DEC_MESSAGE_CREATE ) -continue ; - - offset = msg[1 ]; - size = msg[2 ]; - -if (size <4 || offset + size > end - addr) { -DRM_ERROR ("VCN message buffer exceeds BO bounds!\n" ); - r = -EINVAL ; - goto out; - } - - create = ptr + addr + offset - start; - -/* H264, HEVC and VP9 can run on any instance */ -if (create[0 ] ==0x7 || create[0 ] ==0x10 || create[0 ] ==0x11 ) -continue ; - - r =vcn_v4_0_limit_sched (p, job); -if (r) - goto out; - } - -out: -amdgpu_bo_kunmap (bo); -return r; -} -#define RADEON_VCN_ENGINE_TYPE_ENCODE (0x00000002)#define RADEON_VCN_ENGINE_TYPE_DECODE (0x00000003)#define RADEON_VCN_ENGINE_INFO (0x30000001)@@ -1957,7 +1859,8 @@ static int vcn_v4_0_ring_patch_cs_in_place(struct amdgpu_cs_parser *p, msg_buffer_addr = ((u64 )amdgpu_ib_get_value (ib, idx +7 )) <<32 |amdgpu_ib_get_value (ib, idx +8 ); -return vcn_v4_0_dec_msg (p, job, msg_buffer_addr); +return amdgpu_vcn_dec_msg_limit_sched (p, job, msg_buffer_addr, + vcn_v4_0_limit_sched); }else if (val ==RADEON_VCN_ENGINE_TYPE_ENCODE ) { sidx =vcn_v4_0_enc_find_ib_param (ib,RENCODE_IB_PARAM_SESSION_INIT , idx); if (sidx >= 0 &&
RE: [PATCH v3 3/3] drm/amdgpu/vcn: Factor out vcn_v{3,4}_0_dec_msg
In reply to Benjamin Cheng[AMD Official Use Only - AMD Internal Distribution Only]
Thanks,
Ruijing
-----Original Message-----
From: Benjamin Cheng <[email protected]>
Sent: Wednesday, April 8, 2026 8:54 AM
To: Deucher, Alexander <[email protected]>; Koenig, Christian <[email protected]>; Liu, Leo <[email protected]>; [email protected]
Cc: Wu, David <[email protected]>; Dong, Ruijing <[email protected]>; Cheng, Benjamin <[email protected]>
Subject: [PATCH v3 3/3] drm/amdgpu/vcn: Factor out vcn_v{3,4}_0_dec_msg
Both vcn_v3_0 and vcn_v4_0 use the same interface, so unify the code.
---
v2: Moved RDECODE_* defines to header in patch #1.
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 100 +++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 5 ++ drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 102 +----------------------- drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 101 +---------------------- 4 files changed, 109 insertions(+), 199 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +100 -0
@@ -1641,3 +1641,103 @@ void amdgpu_vcn_print_ip_state(struct amdgpu_ip_block *ip_block, struct drm_prin } } } + +int amdgpu_vcn_dec_msg_limit_sched (struct amdgpu_cs_parser *p, +struct amdgpu_job *job,uint64_t addr, +int (*limit_sched)(struct amdgpu_cs_parser *, +struct amdgpu_job *)) +{ +struct ttm_operation_ctx ctx = { false, false }; +struct amdgpu_device *adev = p->adev; +struct amdgpu_bo_va_mapping *map; +uint32_t *msg, num_buffers, len_dw; +struct amdgpu_bo *bo; +uint64_t start, end; +unsigned int i; +void *ptr; +int r; + + addr &=AMDGPU_GMC_HOLE_MASK ; + r =amdgpu_cs_find_mapping (p, addr, &bo, &map); +if (r) { +DRM_ERROR ("Can't find BO for addr 0x%08llx\n" , addr); +return r; + } + + start = map->start *AMDGPU_GPU_PAGE_SIZE ; + end = (map->last +1 ) *AMDGPU_GPU_PAGE_SIZE ; +if (addr &0x7 ) { +DRM_ERROR ("VCN messages must be 8 byte aligned!\n" ); +return -EINVAL ; + } + +if (end - addr <16 ) { +DRM_ERROR ("VCN messages must be at least 4 DWORDs!\n" ); +return -EINVAL ; + } + + bo->flags |=AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED ; +amdgpu_bo_placement_from_domain (bo, bo->allowed_domains); + r =ttm_bo_validate (&bo->tbo, &bo->placement, &ctx); +if (r) { +DRM_ERROR ("Failed validating the VCN message BO (%d)!\n" , r); +return r; + } + + r =amdgpu_bo_kmap (bo, &ptr); +if (r) { +DRM_ERROR ("Failed mapping the VCN message (%d)!\n" , r); +return r; + } + + msg = ptr + addr - start; + +if (msg[1 ] > end - addr) { +DRM_ERROR ("VCN message header does not fit in BO!\n" ); + r = -EINVAL ; + goto out; + } + +if (msg[3 ] !=VCN_DEC_MSG_CREATE ) + goto out; + + len_dw = msg[1 ] /4 ; + num_buffers = msg[2 ]; + +/* Verify that all indices fit within the claimed length. Each index is 4 DWORDs */ +if (num_buffers > len_dw ||6 + num_buffers *4 > len_dw) { +DRM_ERROR ("VCN message has too many buffers!\n" ); + r = -EINVAL ; + goto out; + } + +for (i =0 , msg = &msg[6 ]; i < num_buffers; ++i, msg +=4 ) { +uint32_t offset, size, *create; + +if (msg[0 ] !=VCN_DEC_MESSAGE_CREATE ) +continue ; + + offset = msg[1 ]; + size = msg[2 ]; + +if (size <4 || offset + size > end - addr) { +DRM_ERROR ("VCN message buffer exceeds BO bounds!\n" ); + r = -EINVAL ; + goto out; + } + + create = ptr + addr + offset - start; + +/* H264, HEVC and VP9 can run on any instance */ +if (create[0 ] ==0x7 || create[0 ] ==0x10 || create[0 ] ==0x11 ) +continue ; + + r =limit_sched (p, job); +if (r) + goto out; + } + +out: +amdgpu_bo_kunmap (bo); +return r; +}
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h +5 -0
@@ -573,4 +573,9 @@ void amdgpu_vcn_print_ip_state(struct amdgpu_ip_block *ip_block, struct drm_prin void amdgpu_vcn_get_profile(struct amdgpu_device *adev); void amdgpu_vcn_put_profile(struct amdgpu_device *adev); +int amdgpu_vcn_dec_msg_limit_sched (struct amdgpu_cs_parser *p,struct amdgpu_job *job, +uint64_t addr, +int (*limit_sched)(struct amdgpu_cs_parser *, +struct amdgpu_job *)); +#endif
drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c +2 -100
114 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c +2 -99
113 lines not on this page · raw message
--
2.53.0
Christian König
maintainerQuoted 17 lines · Benjamin Cheng
These defines can be shared. Move them and prefix with
VCN_DEC_instead.Signed-off-by Benjamin Cheng <[email protected]>---
v3: Renamed toVCN_DEC_drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 3 +++ drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 7 ++----- drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 7 ++----- drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c | 3 --- 4 files changed, 7 insertions(+), 13 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h +0
-0
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h line 62
Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h +3
-0@@ -57,6 +57,9 @@#define VCN_DEC_SW_CMD_REG_WRITE 0x0000000b#define VCN_DEC_SW_CMD_REG_WAIT 0x0000000c +#define VCN_DEC_MSG_CREATE 0x00000000 +#define VCN_DEC_MESSAGE_CREATE 0x00000001 +
That looks better but now we have two defines which sound mostly the same but have different values.
I briefly remember why that was necessary, but we clearly need to document that.
Christian.
Quoted 81 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h +0
-0#define VCN_ENC_CMD_NO_OP 0x00000000#define VCN_ENC_CMD_END 0x00000001#define VCN_ENC_CMD_IB 0x00000002drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c +2
-5@@ -58,9 +58,6 @@#define VCN_INSTANCES_SIENNA_CICHLID 2#define DEC_SW_RING_ENABLED FALSE -#define RDECODE_MSG_CREATE 0x00000000 -#define RDECODE_MESSAGE_CREATE 0x00000001 -static const struct amdgpu_hwip_reg_entry vcn_reg_list_3_0[] = {SOC15_REG_ENTRY_STR (VCN ,0 , mmUVD_POWER_STATUS),SOC15_REG_ENTRY_STR (VCN ,0 , mmUVD_STATUS),@@ -1957,7 +1954,7 @@ static int vcn_v3_0_dec_msg(struct amdgpu_cs_parser *p, struct amdgpu_job *job, goto out; } -if (msg[3 ] !=RDECODE_MSG_CREATE ) +if (msg[3 ] !=VCN_DEC_MSG_CREATE ) goto out; len_dw = msg[1 ] /4 ;@@ -1973,7 +1970,7 @@ static int vcn_v3_0_dec_msg(struct amdgpu_cs_parser *p, struct amdgpu_job *job,for (i =0 , msg = &msg[6 ]; i < num_buffers; ++i, msg +=4 ) {uint32_t offset, size, *create; -if (msg[0 ] !=RDECODE_MESSAGE_CREATE ) +if (msg[0 ] !=VCN_DEC_MESSAGE_CREATE )continue ; offset = msg[1 ];drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c +2
-5@@ -50,9 +50,6 @@#define VCN_HARVEST_MMSCH 0 -#define RDECODE_MSG_CREATE 0x00000000 -#define RDECODE_MESSAGE_CREATE 0x00000001 -static const struct amdgpu_hwip_reg_entry vcn_reg_list_4_0[] = {SOC15_REG_ENTRY_STR (VCN ,0 , regUVD_POWER_STATUS),SOC15_REG_ENTRY_STR (VCN ,0 , regUVD_STATUS),@@ -1874,7 +1871,7 @@ static int vcn_v4_0_dec_msg(struct amdgpu_cs_parser *p, struct amdgpu_job *job, goto out; } -if (msg[3 ] !=RDECODE_MSG_CREATE ) +if (msg[3 ] !=VCN_DEC_MSG_CREATE ) goto out; len_dw = msg[1 ] /4 ;@@ -1890,7 +1887,7 @@ static int vcn_v4_0_dec_msg(struct amdgpu_cs_parser *p, struct amdgpu_job *job,for (i =0 , msg = &msg[6 ]; i < num_buffers; ++i, msg +=4 ) {uint32_t offset, size, *create; -if (msg[0 ] !=RDECODE_MESSAGE_CREATE ) +if (msg[0 ] !=VCN_DEC_MESSAGE_CREATE )continue ; offset = msg[1 ];drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c +0
-3@@ -50,9 +50,6 @@#define VCN_HARVEST_MMSCH 0 -#define RDECODE_MSG_CREATE 0x00000000 -#define RDECODE_MESSAGE_CREATE 0x00000001 -static const struct amdgpu_hwip_reg_entry vcn_reg_list_4_0_5[] = {SOC15_REG_ENTRY_STR (VCN ,0 , regUVD_POWER_STATUS),SOC15_REG_ENTRY_STR (VCN ,0 , regUVD_STATUS),
[AMD Official Use Only - AMD Internal Distribution Only]
Thanks,
Ruijing
-----Original Message-----
From: Benjamin Cheng <[email protected]>
Sent: Wednesday, April 8, 2026 8:54 AM
To: Deucher, Alexander <[email protected]>; Koenig, Christian <[email protected]>; Liu, Leo <[email protected]>; [email protected]
Cc: Wu, David <[email protected]>; Dong, Ruijing <[email protected]>; Cheng, Benjamin <[email protected]>
Subject: [PATCH v3 1/3] drm/amdgpu/vcn: Move RDECODE_* to amdgpu_vcn.h
These defines can be shared. Move them and prefix with VCN_DEC_ instead.
---
v3: Renamed to VCN_DEC_
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 3 +++ drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 7 ++----- drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 7 ++----- drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c | 3 --- 4 files changed, 7 insertions(+), 13 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h +3 -0
@@ -57,6 +57,9 @@#define VCN_DEC_SW_CMD_REG_WRITE 0x0000000b#define VCN_DEC_SW_CMD_REG_WAIT 0x0000000c +#define VCN_DEC_MSG_CREATE 0x00000000 +#define VCN_DEC_MESSAGE_CREATE 0x00000001 +#define VCN_ENC_CMD_NO_OP 0x00000000#define VCN_ENC_CMD_END 0x00000001#define VCN_ENC_CMD_IB 0x00000002
drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c +0 -3
@@ -58,9 +58,6 @@#define VCN_INSTANCES_SIENNA_CICHLID 2#define DEC_SW_RING_ENABLED FALSE -#define RDECODE_MSG_CREATE 0x00000000 -#define RDECODE_MESSAGE_CREATE 0x00000001 -static const struct amdgpu_hwip_reg_entry vcn_reg_list_3_0[] = {SOC15_REG_ENTRY_STR (VCN ,0 , mmUVD_POWER_STATUS), SOC15_REG_ENTRY_STR(VCN, 0, mmUVD_STATUS), @@ -1957,7 +1954,7 @@ static int vcn_v3_0_dec_msg(struct amdgpu_cs_parser *p, struct amdgpu_job *job,
goto out;
}- if (msg[3] != RDECODE_MSG_CREATE)
+ if (msg[3] != VCN_DEC_MSG_CREATE)
goto out;
len_dw = msg[1] / 4;
@@ -1973,7 +1970,7 @@ static int vcn_v3_0_dec_msg(struct amdgpu_cs_parser *p, struct amdgpu_job *job,
for (i = 0, msg = &msg[6]; i < num_buffers; ++i, msg += 4) {
uint32_t offset, size, *create;- if (msg[0] != RDECODE_MESSAGE_CREATE)
+ if (msg[0] != VCN_DEC_MESSAGE_CREATE)
continue;
offset = msg[1];drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c +0 -3
@@ -50,9 +50,6 @@#define VCN_HARVEST_MMSCH 0 -#define RDECODE_MSG_CREATE 0x00000000 -#define RDECODE_MESSAGE_CREATE 0x00000001 -static const struct amdgpu_hwip_reg_entry vcn_reg_list_4_0[] = {SOC15_REG_ENTRY_STR (VCN ,0 , regUVD_POWER_STATUS), SOC15_REG_ENTRY_STR(VCN, 0, regUVD_STATUS), @@ -1874,7 +1871,7 @@ static int vcn_v4_0_dec_msg(struct amdgpu_cs_parser *p, struct amdgpu_job *job,
goto out;
}- if (msg[3] != RDECODE_MSG_CREATE)
+ if (msg[3] != VCN_DEC_MSG_CREATE)
goto out;
len_dw = msg[1] / 4;
@@ -1890,7 +1887,7 @@ static int vcn_v4_0_dec_msg(struct amdgpu_cs_parser *p, struct amdgpu_job *job,
for (i = 0, msg = &msg[6]; i < num_buffers; ++i, msg += 4) {
uint32_t offset, size, *create;- if (msg[0] != RDECODE_MESSAGE_CREATE)
+ if (msg[0] != VCN_DEC_MESSAGE_CREATE)
continue;
offset = msg[1];drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c +0 -3
@@ -50,9 +50,6 @@#define VCN_HARVEST_MMSCH 0 -#define RDECODE_MSG_CREATE 0x00000000 -#define RDECODE_MESSAGE_CREATE 0x00000001 -static const struct amdgpu_hwip_reg_entry vcn_reg_list_4_0_5[] = {SOC15_REG_ENTRY_STR (VCN ,0 , regUVD_POWER_STATUS),SOC15_REG_ENTRY_STR (VCN ,0 , regUVD_STATUS),
--
2.53.0