VCN 4.x support
Subsystems (2)
Alex Deucher
maintainercover VCN 4.x support
This adds support for VCN (Video Codec Next) media blocks v 4.x. The first patch is very large as it adds register headers and as such is too large for the mailing list.
James Zhu (7):
drm/amdgpu: move out asic specific definition from common header drm/amdgpu: add irq sources for vcn v4_0 drm/amdgpu/jpeg: add jpeg support for VCN4_0_0 drm/amdgpu/jpeg: enable JPEG PG and CG for VCN4_0_0 drm/amdgpu/vcn: enable vcn4 dpg mode
drm/amdgpu: add vcn_4_0_0 video codec query drm/amdgpu/discovery: add VCN 4.0 Support
Leo Liu (3):
drm/amdgpu: add vcn 4_0_0 header files v7
drm/amdgpu: make software ring functions reuseable for newer VCN drm/amdgpu: add VCN4 ip block support
Sonny Jiang (1):
drm/amdgpu: enable VCN4 PG and CG for VCN4_0_0
drivers/gpu/drm/amd/amdgpu/Makefile | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 6 + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 19 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 18 +- drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c | 609 ++ drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.h | 29 + drivers/gpu/drm/amd/amdgpu/soc21.c | 53 +- drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 3 + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 3 + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 26 +- drivers/gpu/drm/amd/amdgpu/vcn_v3_0.h | 12 + drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 1877 ++++ drivers/gpu/drm/amd/amdgpu/vcn_v4_0.h | 29 + .../include/asic_reg/vcn/vcn_4_0_0_offset.h | 1610 ++++ .../include/asic_reg/vcn/vcn_4_0_0_sh_mask.h | 8055 +++++++++++++++++ .../amd/include/ivsrcid/vcn/irqsrcs_vcn_4_0.h | 41 + 16 files changed, 12375 insertions(+), 19 deletions(-) create mode 100644 drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c create mode 100644 drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.h create mode 100644 drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c create mode 100644 drivers/gpu/drm/amd/amdgpu/vcn_v4_0.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_4_0_0_offset.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_4_0_0_sh_mask.h create mode 100644 drivers/gpu/drm/amd/include/ivsrcid/vcn/irqsrcs_vcn_4_0.h
Signature · 1 line
2.35.1
Alex Deucher
maintainerPATCH 2/11 drm/amdgpu: make software ring functions reuseable for newer VCN
From: Leo Liu <[email protected]>
Software ring will be supported only from VCN4
--- drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 23 +++++++++++------------ drivers/gpu/drm/amd/amdgpu/vcn_v3_0.h | 12 ++++++++++++ 2 files changed, 23 insertions(+), 12 deletions(-)
drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c +11 -12
@@ -1728,8 +1728,8 @@ static void vcn_v3_0_dec_ring_set_wptr(struct amdgpu_ring *ring) } } -static void vcn_v3_0_dec_sw_ring_emit_fence (struct amdgpu_ring *ring,u64 addr, -u64 seq,uint32_t flags) +void vcn_v3_0_dec_sw_ring_emit_fence (struct amdgpu_ring *ring,u64 addr, +u64 seq,uint32_t flags) {WARN_ON (flags &AMDGPU_FENCE_FLAG_64BIT );
@@ -1740,15 +1740,13 @@ static void vcn_v3_0_dec_sw_ring_emit_fence(struct amdgpu_ring *ring, u64 addr,amdgpu_ring_write (ring,VCN_DEC_SW_CMD_TRAP ); } -static void vcn_v3_0_dec_sw_ring_insert_end (struct amdgpu_ring *ring) +void vcn_v3_0_dec_sw_ring_insert_end (struct amdgpu_ring *ring) {amdgpu_ring_write (ring,VCN_DEC_SW_CMD_END ); } -static void vcn_v3_0_dec_sw_ring_emit_ib (struct amdgpu_ring *ring, -struct amdgpu_job *job, -struct amdgpu_ib *ib, -uint32_t flags) +void vcn_v3_0_dec_sw_ring_emit_ib (struct amdgpu_ring *ring,struct amdgpu_job *job, +struct amdgpu_ib *ib,uint32_t flags) {uint32_t vmid =AMDGPU_JOB_GET_VMID (job);
@@ -1759,8 +1757,8 @@ static void vcn_v3_0_dec_sw_ring_emit_ib(struct amdgpu_ring *ring,amdgpu_ring_write (ring, ib->length_dw); } -static void vcn_v3_0_dec_sw_ring_emit_reg_wait (struct amdgpu_ring *ring,uint32_t reg, -uint32_t val,uint32_t mask) +void vcn_v3_0_dec_sw_ring_emit_reg_wait (struct amdgpu_ring *ring,uint32_t reg, +uint32_t val,uint32_t mask) {amdgpu_ring_write (ring,VCN_DEC_SW_CMD_REG_WAIT );amdgpu_ring_write (ring, reg <<2 );
@@ -1768,8 +1766,8 @@ static void vcn_v3_0_dec_sw_ring_emit_reg_wait(struct amdgpu_ring *ring, uint32_amdgpu_ring_write (ring, val); } -static void vcn_v3_0_dec_sw_ring_emit_vm_flush (struct amdgpu_ring *ring, -uint32_t vmid,uint64_t pd_addr) +void vcn_v3_0_dec_sw_ring_emit_vm_flush (struct amdgpu_ring *ring, +uint32_t vmid,uint64_t pd_addr) {struct amdgpu_vmhub *hub = &ring->adev->vmhub[ring->funcs->vmhub];uint32_t data0, data1, mask;
@@ -1783,7 +1781,8 @@ static void vcn_v3_0_dec_sw_ring_emit_vm_flush(struct amdgpu_ring *ring,vcn_v3_0_dec_sw_ring_emit_reg_wait (ring, data0, data1, mask); } -static void vcn_v3_0_dec_sw_ring_emit_wreg (struct amdgpu_ring *ring,uint32_t reg,uint32_t val) +void vcn_v3_0_dec_sw_ring_emit_wreg (struct amdgpu_ring *ring,uint32_t reg, +uint32_t val) {amdgpu_ring_write (ring,VCN_DEC_SW_CMD_REG_WRITE );amdgpu_ring_write (ring, reg <<2 );
drivers/gpu/drm/amd/amdgpu/vcn_v3_0.h +12 -0
@@ -26,4 +26,16 @@extern const struct amdgpu_ip_block_version vcn_v3_0_ip_block; +void vcn_v3_0_dec_sw_ring_emit_fence (struct amdgpu_ring *ring,u64 addr, +u64 seq,uint32_t flags); +void vcn_v3_0_dec_sw_ring_insert_end (struct amdgpu_ring *ring); +void vcn_v3_0_dec_sw_ring_emit_ib (struct amdgpu_ring *ring,struct amdgpu_job *job, +struct amdgpu_ib *ib,uint32_t flags); +void vcn_v3_0_dec_sw_ring_emit_reg_wait (struct amdgpu_ring *ring,uint32_t reg, +uint32_t val,uint32_t mask); +void vcn_v3_0_dec_sw_ring_emit_vm_flush (struct amdgpu_ring *ring, +uint32_t vmid,uint64_t pd_addr); +void vcn_v3_0_dec_sw_ring_emit_wreg (struct amdgpu_ring *ring,uint32_t reg, +uint32_t val); +#endif /* __VCN_V3_0_H__ */
Signature · 1 line
2.35.1
Christian König
maintainerRe: [PATCH 02/11] drm/amdgpu: make software ring functions reuseable for newer VCN
Maybe we should make nails with heads and move that into an amdgpu_vnc_sw_ring.c file since it is completely IP version independend now.
Regards,
Christian.
Am 02.05.22 um 21:07 schrieb Alex Deucher:
Quoted 100 lines
From: Leo Liu <[email protected]>
Software ring will be supported only from VCN4
Signed-off-by Leo Liu <[email protected]>Reviewed-by James Zhu <[email protected]>Acked-by Christian König <[email protected]>Signed-off-by Alex Deucher <[email protected]>--- drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 23 +++++++++++------------ drivers/gpu/drm/amd/amdgpu/vcn_v3_0.h | 12 ++++++++++++ 2 files changed, 23 insertions(+), 12 deletions(-)drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c +11
-12@@ -1728,8 +1728,8 @@ static void vcn_v3_0_dec_ring_set_wptr(struct amdgpu_ring *ring) } } -static void vcn_v3_0_dec_sw_ring_emit_fence (struct amdgpu_ring *ring,u64 addr, -u64 seq,uint32_t flags) +void vcn_v3_0_dec_sw_ring_emit_fence (struct amdgpu_ring *ring,u64 addr, +u64 seq,uint32_t flags) {WARN_ON (flags &AMDGPU_FENCE_FLAG_64BIT );@@ -1740,15 +1740,13 @@ static void vcn_v3_0_dec_sw_ring_emit_fence(struct amdgpu_ring *ring, u64 addr,amdgpu_ring_write (ring,VCN_DEC_SW_CMD_TRAP ); } -static void vcn_v3_0_dec_sw_ring_insert_end (struct amdgpu_ring *ring) +void vcn_v3_0_dec_sw_ring_insert_end (struct amdgpu_ring *ring) {amdgpu_ring_write (ring,VCN_DEC_SW_CMD_END ); } -static void vcn_v3_0_dec_sw_ring_emit_ib (struct amdgpu_ring *ring, -struct amdgpu_job *job, -struct amdgpu_ib *ib, -uint32_t flags) +void vcn_v3_0_dec_sw_ring_emit_ib (struct amdgpu_ring *ring,struct amdgpu_job *job, +struct amdgpu_ib *ib,uint32_t flags) {uint32_t vmid =AMDGPU_JOB_GET_VMID (job);@@ -1759,8 +1757,8 @@ static void vcn_v3_0_dec_sw_ring_emit_ib(struct amdgpu_ring *ring,amdgpu_ring_write (ring, ib->length_dw); } -static void vcn_v3_0_dec_sw_ring_emit_reg_wait (struct amdgpu_ring *ring,uint32_t reg, -uint32_t val,uint32_t mask) +void vcn_v3_0_dec_sw_ring_emit_reg_wait (struct amdgpu_ring *ring,uint32_t reg, +uint32_t val,uint32_t mask) {amdgpu_ring_write (ring,VCN_DEC_SW_CMD_REG_WAIT );amdgpu_ring_write (ring, reg <<2 );@@ -1768,8 +1766,8 @@ static void vcn_v3_0_dec_sw_ring_emit_reg_wait(struct amdgpu_ring *ring, uint32_amdgpu_ring_write (ring, val); } -static void vcn_v3_0_dec_sw_ring_emit_vm_flush (struct amdgpu_ring *ring, -uint32_t vmid,uint64_t pd_addr) +void vcn_v3_0_dec_sw_ring_emit_vm_flush (struct amdgpu_ring *ring, +uint32_t vmid,uint64_t pd_addr) {struct amdgpu_vmhub *hub = &ring->adev->vmhub[ring->funcs->vmhub];uint32_t data0, data1, mask;@@ -1783,7 +1781,8 @@ static void vcn_v3_0_dec_sw_ring_emit_vm_flush(struct amdgpu_ring *ring,vcn_v3_0_dec_sw_ring_emit_reg_wait (ring, data0, data1, mask); } -static void vcn_v3_0_dec_sw_ring_emit_wreg (struct amdgpu_ring *ring,uint32_t reg,uint32_t val) +void vcn_v3_0_dec_sw_ring_emit_wreg (struct amdgpu_ring *ring,uint32_t reg, +uint32_t val) {amdgpu_ring_write (ring,VCN_DEC_SW_CMD_REG_WRITE );amdgpu_ring_write (ring, reg <<2 );drivers/gpu/drm/amd/amdgpu/vcn_v3_0.h +12
-0@@ -26,4 +26,16 @@extern const struct amdgpu_ip_block_version vcn_v3_0_ip_block; +void vcn_v3_0_dec_sw_ring_emit_fence (struct amdgpu_ring *ring,u64 addr, +u64 seq,uint32_t flags); +void vcn_v3_0_dec_sw_ring_insert_end (struct amdgpu_ring *ring); +void vcn_v3_0_dec_sw_ring_emit_ib (struct amdgpu_ring *ring,struct amdgpu_job *job, +struct amdgpu_ib *ib,uint32_t flags); +void vcn_v3_0_dec_sw_ring_emit_reg_wait (struct amdgpu_ring *ring,uint32_t reg, +uint32_t val,uint32_t mask); +void vcn_v3_0_dec_sw_ring_emit_vm_flush (struct amdgpu_ring *ring, +uint32_t vmid,uint64_t pd_addr); +void vcn_v3_0_dec_sw_ring_emit_wreg (struct amdgpu_ring *ring,uint32_t reg, +uint32_t val); +#endif /* __VCN_V3_0_H__ */
Alex Deucher
maintainerPATCH 3/11 drm/amdgpu: move out asic specific definition from common header
In reply to Alex DeucherFrom: James Zhu <[email protected]>
Move out asic specific definition from common header.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 2 -- drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 3 +++ drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 3 +++ drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 3 +++ 4 files changed, 9 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h +0 -2
@@ -65,8 +65,6 @@#define VCN_ENC_CMD_REG_WRITE 0x0000000b#define VCN_ENC_CMD_REG_WAIT 0x0000000c -#define VCN_VID_SOC_ADDRESS_2_0 0x1fa00 -#define VCN1_VID_SOC_ADDRESS_3_0 0x48200#define VCN_AON_SOC_ADDRESS_2_0 0x1f800#define VCN1_AON_SOC_ADDRESS_3_0 0x48000#define VCN_VID_IP_ADDRESS_2_0 0x0
drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c +3 -0
@@ -37,6 +37,9 @@#include "vcn/vcn_2_0_0_sh_mask.h" #include "ivsrcid/vcn/irqsrcs_vcn_2_0.h" +#define VCN_VID_SOC_ADDRESS_2_0 0x1fa00 +#define VCN1_VID_SOC_ADDRESS_3_0 0x48200 +#define mmUVD_CONTEXT_ID_INTERNAL_OFFSET 0x1fd#define mmUVD_GPCOM_VCPU_CMD_INTERNAL_OFFSET 0x503#define mmUVD_GPCOM_VCPU_DATA0_INTERNAL_OFFSET 0x504
drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c +3 -0
@@ -37,6 +37,9 @@#include "vcn/vcn_2_5_sh_mask.h" #include "ivsrcid/vcn/irqsrcs_vcn_2_0.h" +#define VCN_VID_SOC_ADDRESS_2_0 0x1fa00 +#define VCN1_VID_SOC_ADDRESS_3_0 0x48200 +#define mmUVD_CONTEXT_ID_INTERNAL_OFFSET 0x27#define mmUVD_GPCOM_VCPU_CMD_INTERNAL_OFFSET 0x0f#define mmUVD_GPCOM_VCPU_DATA0_INTERNAL_OFFSET 0x10
drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c +3 -0
@@ -37,6 +37,9 @@#include <drm/drm_drv.h> +#define VCN_VID_SOC_ADDRESS_2_0 0x1fa00 +#define VCN1_VID_SOC_ADDRESS_3_0 0x48200 +#define mmUVD_CONTEXT_ID_INTERNAL_OFFSET 0x27#define mmUVD_GPCOM_VCPU_CMD_INTERNAL_OFFSET 0x0f#define mmUVD_GPCOM_VCPU_DATA0_INTERNAL_OFFSET 0x10
Signature · 1 line
2.35.1
Alex Deucher
maintainerPATCH 4/11 drm/amdgpu: add irq sources for vcn v4_0
In reply to Alex DeucherFrom: James Zhu <[email protected]>
Add the interrupt source packet definitions for VCN4.
--- .../amd/include/ivsrcid/vcn/irqsrcs_vcn_4_0.h | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 drivers/gpu/drm/amd/include/ivsrcid/vcn/irqsrcs_vcn_4_0.h
drivers/gpu/drm/amd/include/ivsrcid/vcn/irqsrcs_vcn_4_0.h new file +41 -0
@@ -0,0 +1,41 @@ +/* +* Copyright 2022 Advanced Micro Devices, Inc. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR +* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +* OTHER DEALINGS IN THE SOFTWARE. +*/ + +#ifndef __IRQSRCS_VCN_4_0_H__ +#define __IRQSRCS_VCN_4_0_H__ + +#define VCN_4_0__SRCID__UVD_TRAP 114 // 0x72 UVD_TRAP +#define VCN_4_0__SRCID__UVD_ENC_GENERAL_PURPOSE 119 // 0x77 Encoder General Purpose +#define VCN_4_0__SRCID__UVD_ENC_LOW_LATENCY 120 // 0x78 Encoder Low Latency +#define VCN_4_0__SRCID__UVD_SYSTEM_MESSAGE_INTERRUPT 124 // 0x7c UVD system message interrupt +#define VCN_4_0__SRCID__JPEG_ENCODE 151 // 0x97 JRBC Encode interrupt +#define VCN_4_0__SRCID__JPEG_DECODE 153 // 0x99 JRBC Decode interrupt + +#define VCN_4_0__SRCID__JPEG1_DECODE 149 // 0x95 JRBC1 Decode interrupt +#define VCN_4_0__SRCID__JPEG2_DECODE VCN_4_0__SRCID__JPEG_ENCODE//0x97 JRBC2 Decode interrupt +#define VCN_4_0__SRCID__JPEG3_DECODE 171 // 0xab JRBC3 Decode interrupt +#define VCN_4_0__SRCID__JPEG4_DECODE 172 // 0xac JRBC4 Decode interrupt +#define VCN_4_0__SRCID__JPEG5_DECODE 173 // 0xad JRBC5 Decode interrupt +#define VCN_4_0__SRCID__JPEG6_DECODE 174 // 0xae JRBC6 Decode interrupt +#define VCN_4_0__SRCID__JPEG7_DECODE 175 // 0xaf JRBC7 Decode interrupt + +#endif
Signature · 1 line
2.35.1
Alex Deucher
maintainerPATCH 5/11 drm/amdgpu: add VCN4 ip block support
In reply to Alex DeucherFrom: Leo Liu <[email protected]>
Add VCN 4.0 initialization and decoder/encoder ring functions.
--- drivers/gpu/drm/amd/amdgpu/Makefile | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 19 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 16 + drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 1877 +++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/vcn_v4_0.h | 29 + 5 files changed, 1940 insertions(+), 2 deletions(-) create mode 100644 drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c create mode 100644 drivers/gpu/drm/amd/amdgpu/vcn_v4_0.h
drivers/gpu/drm/amd/amdgpu/Makefile +1 -0
@@ -171,6 +171,7 @@ amdgpu-y += \ vcn_v2_0.o \ vcn_v2_5.o \ vcn_v3_0.o \ + vcn_v4_0.o \ amdgpu_jpeg.o \ jpeg_v1_0.o \ jpeg_v2_0.o \
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +17 -2
@@ -53,6 +53,7 @@#define FIRMWARE_BEIGE_GOBY "amdgpu/beige_goby_vcn.bin"#define FIRMWARE_YELLOW_CARP "amdgpu/yellow_carp_vcn.bin"#define FIRMWARE_VCN_3_1_2 "amdgpu/vcn_3_1_2.bin" +#define FIRMWARE_VCN4_0_0 "amdgpu/vcn_4_0_0.bin"MODULE_FIRMWARE (FIRMWARE_RAVEN );MODULE_FIRMWARE (FIRMWARE_PICASSO );
@@ -71,6 +72,7 @@ MODULE_FIRMWARE(FIRMWARE_DIMGREY_CAVEFISH);MODULE_FIRMWARE (FIRMWARE_BEIGE_GOBY );MODULE_FIRMWARE (FIRMWARE_YELLOW_CARP );MODULE_FIRMWARE (FIRMWARE_VCN_3_1_2 ); +MODULE_FIRMWARE (FIRMWARE_VCN4_0_0 );static void amdgpu_vcn_idle_work_handler (struct work_struct *work);
@@ -175,6 +177,12 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev) (adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG)) adev->vcn.indirect_sram = true;break ; +case IP_VERSION (4 ,0 ,0 ): + fw_name =FIRMWARE_VCN4_0_0 ; +if ((adev->firmware.load_type ==AMDGPU_FW_LOAD_PSP ) && + (adev->pg_flags &AMD_PG_SUPPORT_VCN_DPG )) + adev->vcn.indirect_sram = true; +break ;default :return -EINVAL ; }
@@ -228,8 +236,15 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev) bo_size =AMDGPU_VCN_STACK_SIZE +AMDGPU_VCN_CONTEXT_SIZE ;if (adev->firmware.load_type !=AMDGPU_FW_LOAD_PSP ) bo_size +=AMDGPU_GPU_PAGE_ALIGN (le32_to_cpu (hdr->ucode_size_bytes) +8 ); - fw_shared_size =AMDGPU_GPU_PAGE_ALIGN (sizeof (struct amdgpu_fw_shared )); - log_offset = offsetof(struct amdgpu_fw_shared , fw_log); + +if (adev->ip_versions[UVD_HWIP ][0 ] >=IP_VERSION (4 ,0 ,0 )){ + fw_shared_size =AMDGPU_GPU_PAGE_ALIGN (sizeof (struct amdgpu_vcn4_fw_shared )); + log_offset = offsetof(struct amdgpu_vcn4_fw_shared , fw_log); + }else { + fw_shared_size =AMDGPU_GPU_PAGE_ALIGN (sizeof (struct amdgpu_fw_shared )); + log_offset = offsetof(struct amdgpu_fw_shared , fw_log); + } + bo_size += fw_shared_size;if (amdgpu_vcnfw_log)
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h +16 -0
@@ -155,6 +155,7 @@ } \ } while (0) +#define AMDGPU_FW_SHARED_FLAG_0_UNIFIED_QUEUE (1 << 2)#define AMDGPU_VCN_FW_SHARED_FLAG_0_RB (1 << 6)#define AMDGPU_VCN_MULTI_QUEUE_FLAG (1 << 8)#define AMDGPU_VCN_SW_RING_FLAG (1 << 9)
@@ -286,6 +287,13 @@ struct amdgpu_fw_shared_sw_ring {uint8_t padding[3 ]; }; +struct amdgpu_fw_shared_unified_queue_struct { +uint8_t is_enabled; +uint8_t queue_mode; +uint8_t queue_status; +uint8_t padding[5 ]; +}; +struct amdgpu_fw_shared_fw_logging {uint8_t is_enabled;uint32_t addr_lo;
@@ -309,6 +317,14 @@ struct amdgpu_fw_shared {struct amdgpu_fw_shared_smu_interface_info smu_interface_info; }; +struct amdgpu_vcn4_fw_shared { +uint32_t present_flag_0; +uint8_t pad[12 ]; +struct amdgpu_fw_shared_unified_queue_struct sq; +uint8_t pad1[8 ]; +struct amdgpu_fw_shared_fw_logging fw_log; +}; +struct amdgpu_vcn_fwlog {uint32_t rptr;uint32_t wptr;
drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c new file +1877 -0
1,877 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/vcn_v4_0.h new file +29 -0
@@ -0,0 +1,29 @@ +/* +* Copyright 2021 Advanced Micro Devices, Inc. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR +* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +* OTHER DEALINGS IN THE SOFTWARE. +* +*/ + +#ifndef __VCN_V4_0_H__ +#define __VCN_V4_0_H__ + +extern const struct amdgpu_ip_block_version vcn_v4_0_ip_block; + +#endif /* __VCN_V4_0_H__ */
Signature · 1 line
2.35.1
Alex Deucher
maintainerPATCH 6/11 drm/amdgpu/jpeg: add jpeg support for VCN4_0_0
In reply to Alex DeucherFrom: James Zhu <[email protected]>
Add jpeg support for VCN4_0_0.
--- drivers/gpu/drm/amd/amdgpu/Makefile | 3 +- drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c | 609 +++++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.h | 29 ++ 3 files changed, 640 insertions(+), 1 deletion(-) create mode 100644 drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c create mode 100644 drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.h
drivers/gpu/drm/amd/amdgpu/Makefile +2 -1
@@ -176,7 +176,8 @@ amdgpu-y += \ jpeg_v1_0.o \ jpeg_v2_0.o \ jpeg_v2_5.o \ - jpeg_v3_0.o + jpeg_v3_0.o \ + jpeg_v4_0.o # add ATHUB block amdgpu-y += \
drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c new file +609 -0
609 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.h new file +29 -0
@@ -0,0 +1,29 @@ +/* +* Copyright 2021 Advanced Micro Devices, Inc. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR +* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +* OTHER DEALINGS IN THE SOFTWARE. +* +*/ + +#ifndef __JPEG_V4_0_H__ +#define __JPEG_V4_0_H__ + +extern const struct amdgpu_ip_block_version jpeg_v4_0_ip_block; + +#endif /* __JPEG_V4_0_H__ */
Signature · 1 line
2.35.1
Alex Deucher
maintainerPATCH 7/11 drm/amdgpu: enable VCN4 PG and CG for VCN4_0_0
In reply to Alex DeucherFrom: Sonny Jiang <[email protected]>
Most of the tiles can be power/clock gated.
--- drivers/gpu/drm/amd/amdgpu/soc21.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/soc21.c +4 -2
@@ -482,8 +482,10 @@ static int soc21_common_early_init(void *handle)case IP_VERSION (11 ,0 ,0 ): adev->cg_flags =AMD_CG_SUPPORT_GFX_CGCG |AMD_CG_SUPPORT_GFX_CGLS | -AMD_CG_SUPPORT_REPEATER_FGCG ; - adev->pg_flags =AMD_PG_SUPPORT_ATHUB | +AMD_CG_SUPPORT_REPEATER_FGCG | +AMD_CG_SUPPORT_VCN_MGCG ; + adev->pg_flags =AMD_PG_SUPPORT_VCN | +AMD_PG_SUPPORT_ATHUB |AMD_PG_SUPPORT_MMHUB ; adev->external_rev_id = adev->rev_id +0x1 ;// TODO: need update break ;
Signature · 1 line
2.35.1
Alex Deucher
maintainerPATCH 8/11 drm/amdgpu/jpeg: enable JPEG PG and CG for VCN4_0_0
In reply to Alex DeucherFrom: James Zhu <[email protected]>
Enable JPEG PG and CG for VCN4_0_0.
--- drivers/gpu/drm/amd/amdgpu/soc21.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/soc21.c +3 -1
@@ -483,8 +483,10 @@ static int soc21_common_early_init(void *handle) adev->cg_flags =AMD_CG_SUPPORT_GFX_CGCG |AMD_CG_SUPPORT_GFX_CGLS |AMD_CG_SUPPORT_REPEATER_FGCG | -AMD_CG_SUPPORT_VCN_MGCG ; +AMD_CG_SUPPORT_VCN_MGCG | +AMD_CG_SUPPORT_JPEG_MGCG ; adev->pg_flags =AMD_PG_SUPPORT_VCN | +AMD_PG_SUPPORT_JPEG |AMD_PG_SUPPORT_ATHUB |AMD_PG_SUPPORT_MMHUB ; adev->external_rev_id = adev->rev_id +0x1 ;// TODO: need update
Signature · 1 line
2.35.1
Alex Deucher
maintainerPATCH 9/11 drm/amdgpu/vcn: enable vcn4 dpg mode
In reply to Alex DeucherFrom: James Zhu <[email protected]>
Enable vcn4 dpg mode.
--- drivers/gpu/drm/amd/amdgpu/soc21.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/soc21.c +1 -0
@@ -486,6 +486,7 @@ static int soc21_common_early_init(void *handle)AMD_CG_SUPPORT_VCN_MGCG |AMD_CG_SUPPORT_JPEG_MGCG ; adev->pg_flags =AMD_PG_SUPPORT_VCN | +AMD_PG_SUPPORT_VCN_DPG |AMD_PG_SUPPORT_JPEG |AMD_PG_SUPPORT_ATHUB |AMD_PG_SUPPORT_MMHUB ;
Signature · 1 line
2.35.1
Alex Deucher
maintainerPATCH 10/11 drm/amdgpu: add vcn_4_0_0 video codec query
In reply to Alex DeucherFrom: James Zhu <[email protected]>
Add vcn_4_0_0 video codec query.
--- drivers/gpu/drm/amd/amdgpu/soc21.c | 44 ++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+)
drivers/gpu/drm/amd/amdgpu/soc21.c +44 -0
@@ -45,6 +45,49 @@static const struct amd_ip_funcs soc21_common_ip_funcs; +/* SOC21 */ +static const struct amdgpu_video_codec_info vcn_4_0_0_video_codecs_encode_array[] = +{ + {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4_AVC ,4096 ,2304 ,0 )}, + {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_HEVC ,4096 ,2304 ,0 )}, +}; + +static const struct amdgpu_video_codecs vcn_4_0_0_video_codecs_encode = +{ + .codec_count =ARRAY_SIZE (vcn_4_0_0_video_codecs_encode_array), + .codec_array = vcn_4_0_0_video_codecs_encode_array, +}; + +static const struct amdgpu_video_codec_info vcn_4_0_0_video_codecs_decode_array[] = +{ + {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4_AVC ,4096 ,4906 ,52 )}, + {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_HEVC ,8192 ,4352 ,186 )}, + {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_JPEG ,4096 ,4096 ,0 )}, + {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_VP9 ,8192 ,4352 ,0 )}, + {codec_info_build (AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_AV1 ,8192 ,4352 ,0 )}, +}; + +static const struct amdgpu_video_codecs vcn_4_0_0_video_codecs_decode = +{ + .codec_count =ARRAY_SIZE (vcn_4_0_0_video_codecs_decode_array), + .codec_array = vcn_4_0_0_video_codecs_decode_array, +}; + +static int soc21_query_video_codecs (struct amdgpu_device *adev,bool encode, +const struct amdgpu_video_codecs **codecs) +{ +switch (adev->ip_versions[UVD_HWIP ][0 ]) { + +case IP_VERSION (4 ,0 ,0 ): +if (encode) + *codecs = &vcn_4_0_0_video_codecs_encode; +else + *codecs = &vcn_4_0_0_video_codecs_decode; +return 0 ; +default : +return -EINVAL ; + } +}/* * Indirect registers accessor */
@@ -451,6 +494,7 @@ static const struct amdgpu_asic_funcs soc21_asic_funcs = .get_pcie_replay_count = &soc21_get_pcie_replay_count, .supports_baco = &amdgpu_dpm_is_baco_supported, .pre_asic_init = &soc21_pre_asic_init, + .query_video_codecs = &soc21_query_video_codecs, };static int soc21_common_early_init (void *handle)
Signature · 1 line
2.35.1
Alex Deucher
maintainerPATCH 11/11 drm/amdgpu/discovery: add VCN 4.0 Support
In reply to Alex DeucherFrom: James Zhu <[email protected]>
Enable VCN 4.0 on asics where it is present.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +6 -0
@@ -68,6 +68,8 @@#include "jpeg_v2_0.h" #include "vcn_v3_0.h" #include "jpeg_v3_0.h" +#include "vcn_v4_0.h" +#include "jpeg_v4_0.h" #include "amdgpu_vkms.h" #include "mes_v10_1.h" #include "mes_v11_0.h"
@@ -1853,6 +1855,10 @@ static int amdgpu_discovery_set_mm_ip_blocks(struct amdgpu_device *adev)case IP_VERSION (3 ,0 ,33 ):amdgpu_device_ip_block_add (adev, &vcn_v3_0_ip_block);break ; +case IP_VERSION (4 ,0 ,0 ): +amdgpu_device_ip_block_add (adev, &vcn_v4_0_ip_block); +amdgpu_device_ip_block_add (adev, &jpeg_v4_0_ip_block); +break ;default : dev_err(adev->dev, "Failed to add vcn/jpeg ip block(UVD_HWIP:0x%x)\n",
Signature · 1 line
2.35.1