drm/amdgpu/vcn: Factor out vcn_v{3,4}_0_dec_msg
Subsystems (2)
PATCH 1/1 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.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 103 +++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 5 ++ drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 105 +----------------------- drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 104 +---------------------- 4 files changed, 112 insertions(+), 205 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +103 -0
@@ -36,6 +36,9 @@#include "amdgpu_vcn.h" #include "soc15d.h" +#define RDECODE_MSG_CREATE 0x00000000 +#define RDECODE_MESSAGE_CREATE 0x00000001 +/* Firmware Names */ #define FIRMWARE_RAVEN "amdgpu/raven_vcn.bin"#define FIRMWARE_PICASSO "amdgpu/picasso_vcn.bin"
@@ -1641,3 +1644,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 ] !=RDECODE_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 ] !=RDECODE_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
@@ -570,4 +570,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 -103
123 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c +2 -102
122 lines not on this page · raw message
Signature · 1 line
2.53.0
[AMD Official Use Only - AMD Internal Distribution Only]
-----Original Message-----
From: Benjamin Cheng <[email protected]>
Sent: Tuesday, April 7, 2026 4:05 PM
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] 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.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 103 +++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 5 ++ drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 105 +----------------------- drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 104 +---------------------- 4 files changed, 112 insertions(+), 205 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +2 -0
@@ -36,6 +36,9 @@#include "amdgpu_vcn.h" #include "soc15d.h" +#define RDECODE_MSG_CREATE 0x00000000 +#define RDECODE_MESSAGE_CREATE 0x00000001
These two macros could be in amdgpu_vcn.h, as other VCNs can share the same definitions.
Thanks,
Ruijing
/* Firmware Names */
#define FIRMWARE_RAVEN "amdgpu/raven_vcn.bin"
#define FIRMWARE_PICASSO "amdgpu/picasso_vcn.bin"
@@ -1641,3 +1644,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] != RDECODE_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] != RDECODE_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
@@ -570,4 +570,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 +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), @@ -1903,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] != RDECODE_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] != RDECODE_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)
@@ -2024,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 +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), @@ -1820,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] != RDECODE_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] != RDECODE_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)
@@ -1960,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 &&--
2.53.0