drm/amdgpu: fix a vcn4 boot poll bug in emulation mode
Subsystems (2)
PATCH 1/5 drm/amdgpu: fix a vcn4 boot poll bug in emulation mode
The return value should be set in vcn4 boot poll.
--- drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c +1 -0
@@ -1041,6 +1041,7 @@ static int vcn_v4_0_start(struct amdgpu_device *adev) }if (amdgpu_emu_mode==1 ) { + r =-1 ;if (status &2 ) { r =0 ;break ;
Signature · 1 line
2.36.1
PATCH 2/5 drm/amdgpu: add VCN function in NBIO v7.7
Add function to support VCN_4_0_2 doorbell
--- drivers/gpu/drm/amd/amdgpu/nbio_v7_7.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
drivers/gpu/drm/amd/amdgpu/nbio_v7_7.c +21 -0
@@ -83,6 +83,26 @@ static void nbio_v7_7_sdma_doorbell_range(struct amdgpu_device *adev, int instanWREG32_PCIE_PORT (reg, doorbell_range); } +static void nbio_v7_7_vcn_doorbell_range (struct amdgpu_device *adev,bool use_doorbell, +int doorbell_index,int instance) +{ +u32 reg =SOC15_REG_OFFSET (NBIO ,0 , regGDC0_BIF_VCN0_DOORBELL_RANGE); +u32 doorbell_range =RREG32_PCIE_PORT (reg); + +if (use_doorbell) { + doorbell_range =REG_SET_FIELD (doorbell_range, +GDC0_BIF_VCN0_DOORBELL_RANGE ,OFFSET , + doorbell_index); + doorbell_range =REG_SET_FIELD (doorbell_range, +GDC0_BIF_VCN0_DOORBELL_RANGE ,SIZE ,8 ); + }else { + doorbell_range =REG_SET_FIELD (doorbell_range, +GDC0_BIF_VCN0_DOORBELL_RANGE ,SIZE ,0 ); + } + +WREG32_PCIE_PORT (reg, doorbell_range); +} +static void nbio_v7_7_enable_doorbell_aperture (struct amdgpu_device *adev,bool enable) {
@@ -238,6 +258,7 @@ const struct amdgpu_nbio_funcs nbio_v7_7_funcs = { .mc_access_enable = nbio_v7_7_mc_access_enable, .get_memsize = nbio_v7_7_get_memsize, .sdma_doorbell_range = nbio_v7_7_sdma_doorbell_range, + .vcn_doorbell_range = nbio_v7_7_vcn_doorbell_range, .enable_doorbell_aperture = nbio_v7_7_enable_doorbell_aperture, .enable_doorbell_selfring_aperture = nbio_v7_7_enable_doorbell_selfring_aperture, .ih_doorbell_range = nbio_v7_7_ih_doorbell_range,
Signature · 1 line
2.36.1
PATCH 3/5 drm/amdgpu: add VCN_4_0_2 firmware support i
In reply to Sonny JiangAdd VCN_4_0_2 firmware support
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +8 -0
@@ -54,6 +54,7 @@#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" +#define FIRMWARE_VCN4_0_2 "amdgpu/vcn_4_0_2.bin"#define FIRMWARE_VCN4_0_4 "amdgpu/vcn_4_0_4.bin"MODULE_FIRMWARE (FIRMWARE_RAVEN );
@@ -74,6 +75,7 @@ MODULE_FIRMWARE(FIRMWARE_BEIGE_GOBY);MODULE_FIRMWARE (FIRMWARE_YELLOW_CARP );MODULE_FIRMWARE (FIRMWARE_VCN_3_1_2 );MODULE_FIRMWARE (FIRMWARE_VCN4_0_0 ); +MODULE_FIRMWARE (FIRMWARE_VCN4_0_2 );MODULE_FIRMWARE (FIRMWARE_VCN4_0_4 );static void amdgpu_vcn_idle_work_handler (struct work_struct *work);
@@ -185,6 +187,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 ,2 ): + fw_name =FIRMWARE_VCN4_0_2 ; +if ((adev->firmware.load_type ==AMDGPU_FW_LOAD_PSP ) && + (adev->pg_flags &AMD_PG_SUPPORT_VCN_DPG )) + adev->vcn.indirect_sram = false; +break ;case IP_VERSION (4 ,0 ,4 ): fw_name =FIRMWARE_VCN4_0_4 ; if ((adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) &&
Signature · 1 line
2.36.1
PATCH 4/5 drm/amdgpu: vcn_4_0_2 video codec query
In reply to Sonny JiangEnable support for vcn_4_0_2 video codec
--- drivers/gpu/drm/amd/amdgpu/soc21.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/soc21.c +1 -0
@@ -80,6 +80,7 @@ static int soc21_query_video_codecs(struct amdgpu_device *adev, bool encode,switch (adev->ip_versions[UVD_HWIP ][0 ]) {case IP_VERSION (4 ,0 ,0 ): +case IP_VERSION (4 ,0 ,2 ):if (encode) *codecs = &vcn_4_0_0_video_codecs_encode;else
Signature · 1 line
2.36.1
PATCH 5/5 drm/amdgpu: enable VCN cg and JPEG cg/pg i
In reply to Sonny JiangNot enable VCN pg because encode issue
--- drivers/gpu/drm/amd/amdgpu/soc21.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/soc21.c +5 -2
@@ -585,8 +585,11 @@ static int soc21_common_early_init(void *handle) adev->external_rev_id = adev->rev_id +0x10 ;break ;case IP_VERSION (11 ,0 ,1 ): - adev->cg_flags =0 ; - adev->pg_flags =0 ; + adev->cg_flags = +AMD_CG_SUPPORT_VCN_MGCG | +AMD_CG_SUPPORT_JPEG_MGCG ; + adev->pg_flags = +AMD_PG_SUPPORT_JPEG ; adev->external_rev_id = adev->rev_id +0x1 ;break ;default :
Signature · 1 line
2.36.1
RE: [PATCH 5/5] drm/amdgpu: enable VCN cg and JPEG cg/pg i
Ping
Best Regards,
Yifan
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Sonny Jiang
Sent: Friday, July 22, 2022 1:27 AM
To: [email protected]
Cc: Jiang, Sonny <[email protected]>; Zhu, James <[email protected]>
Subject: [PATCH 5/5] drm/amdgpu: enable VCN cg and JPEG cg/pg i
Not enable VCN pg because encode issue
--- drivers/gpu/drm/amd/amdgpu/soc21.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/soc21.c +5 -2
@@ -585,8 +585,11 @@ static int soc21_common_early_init(void *handle) adev->external_rev_id = adev->rev_id +0x10 ;break ;case IP_VERSION (11 ,0 ,1 ): - adev->cg_flags =0 ; - adev->pg_flags =0 ; + adev->cg_flags = +AMD_CG_SUPPORT_VCN_MGCG | +AMD_CG_SUPPORT_JPEG_MGCG ; + adev->pg_flags = +AMD_PG_SUPPORT_JPEG ; adev->external_rev_id = adev->rev_id +0x1 ;break ;default :
Signature · 1 line
2.36.1