Revert "drm/amdgpu: use direct loading on renoir vcn for the moment"
Subsystems (2)
PATCH 1/2 Revert "drm/amdgpu: use direct loading on renoir vcn for the moment"
This reverts commit 69fcd7347f6fb11edc7eaea7c7b9cff0044ce17e.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 9 +++------ drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 9 +++------ 2 files changed, 6 insertions(+), 12 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +3 -6
@@ -84,8 +84,7 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev)case CHIP_RENOIR : fw_name =FIRMWARE_RENOIR ;if ((adev->firmware.load_type ==AMDGPU_FW_LOAD_PSP ) && - (adev->pg_flags &AMD_PG_SUPPORT_VCN_DPG ) && - adev->asic_type !=CHIP_RENOIR )/* to be removed while vcn psp loading works */ + (adev->pg_flags &AMD_PG_SUPPORT_VCN_DPG )) adev->vcn.indirect_sram = true;break ;default :
@@ -139,8 +138,7 @@ 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 || - adev->asic_type ==CHIP_RENOIR ) +if (adev->firmware.load_type !=AMDGPU_FW_LOAD_PSP ) bo_size +=AMDGPU_GPU_PAGE_ALIGN (le32_to_cpu (hdr->ucode_size_bytes) +8 ); r = amdgpu_bo_create_kernel(adev, bo_size, PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM, &adev->vcn.vcpu_bo,
@@ -233,8 +231,7 @@ int amdgpu_vcn_resume(struct amdgpu_device *adev)unsigned offset; hdr = (const struct common_firmware_header *)adev->vcn.fw->data; -if (adev->firmware.load_type !=AMDGPU_FW_LOAD_PSP || - adev->asic_type ==CHIP_RENOIR ) { +if (adev->firmware.load_type !=AMDGPU_FW_LOAD_PSP ) { offset =le32_to_cpu (hdr->ucode_array_offset_bytes);memcpy_toio (adev->vcn.cpu_addr, adev->vcn.fw->data + offset,le32_to_cpu (hdr->ucode_size_bytes));
drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c +3 -6
@@ -142,8 +142,7 @@ static int vcn_v2_0_sw_init(void *handle)if (r)return r; -if (adev->firmware.load_type ==AMDGPU_FW_LOAD_PSP && - adev->asic_type !=CHIP_RENOIR ) { +if (adev->firmware.load_type ==AMDGPU_FW_LOAD_PSP ) {const struct common_firmware_header *hdr; hdr = (const struct common_firmware_header *)adev->vcn.fw->data; adev->firmware.ucode[AMDGPU_UCODE_ID_VCN ].ucode_id =AMDGPU_UCODE_ID_VCN ;
@@ -360,8 +359,7 @@ static void vcn_v2_0_mc_resume(struct amdgpu_device *adev)uint32_t offset;/* cache window 0: fw */ -if (adev->firmware.load_type ==AMDGPU_FW_LOAD_PSP && - adev->asic_type !=CHIP_RENOIR ) { +if (adev->firmware.load_type ==AMDGPU_FW_LOAD_PSP ) {WREG32_SOC15 (UVD ,0 , mmUVD_LMI_VCPU_CACHE_64BIT_BAR_LOW, (adev->firmware.ucode[AMDGPU_UCODE_ID_VCN ].tmr_mc_addr_lo)); WREG32_SOC15(UVD, 0, mmUVD_LMI_VCPU_CACHE_64BIT_BAR_HIGH,
@@ -406,8 +404,7 @@ static void vcn_v2_0_mc_resume_dpg_mode(struct amdgpu_device *adev, bool indirecuint32_t offset;/* cache window 0: fw */ -if (adev->firmware.load_type ==AMDGPU_FW_LOAD_PSP && - adev->asic_type !=CHIP_RENOIR ) { +if (adev->firmware.load_type ==AMDGPU_FW_LOAD_PSP ) {if (!indirect) { WREG32_SOC15_DPG_MODE_2_0(SOC15_DPG_MODE_OFFSET_2_0( UVD, 0, mmUVD_LMI_VCPU_CACHE_64BIT_BAR_LOW),
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 2/2 drm/amdgpu: enable VCN DPG for Renoir
Enable VCN Dynamic Powergating on Renoir devices.
This will also enable indirect SRAM loading of VCN firmware on Renoir.
--- drivers/gpu/drm/amd/amdgpu/soc15.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/soc15.c +3 -1
@@ -1038,7 +1038,9 @@ static int soc15_common_early_init(void *handle)AMD_CG_SUPPORT_ATHUB_LS |AMD_CG_SUPPORT_ATHUB_MGCG |AMD_CG_SUPPORT_DF_MGCG ; - adev->pg_flags =AMD_PG_SUPPORT_SDMA ; + adev->pg_flags =AMD_PG_SUPPORT_SDMA | +AMD_PG_SUPPORT_VCN | +AMD_PG_SUPPORT_VCN_DPG ; adev->external_rev_id = adev->rev_id +0x91 ;if (adev->pm.pp_feature &PP_GFXOFF_MASK )
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): [email protected]
Liu, Leo
Reviewed-by Leo LiuRe: [PATCH 2/2] drm/amdgpu: enable VCN DPG for Renoir
Quoted 3 lines · Thong
Enable VCN Dynamic Powergating on Renoir devices.
This will also enable indirect SRAM loading of VCN firmware on Renoir.
This will enable indirect SRAM loading for VCN DPG mode initialization. With that fixed, the patch is:
Quoted 11 lines
Signed-off-by Thong Thai <[email protected]>--- drivers/gpu/drm/amd/amdgpu/soc15.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)drivers/gpu/drm/amd/amdgpu/soc15.c +0
-0
drivers/gpu/drm/amd/amdgpu/soc15.c static int soc15_common_early_init(void *handle) · line 1046
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/soc15.c +3
-1@@ -1038,7 +1038,9 @@ static int soc15_common_early_init(void *handle)AMD_CG_SUPPORT_ATHUB_LS |AMD_CG_SUPPORT_ATHUB_MGCG |AMD_CG_SUPPORT_DF_MGCG ; - adev->pg_flags =AMD_PG_SUPPORT_SDMA ; + adev->pg_flags =AMD_PG_SUPPORT_SDMA | +AMD_PG_SUPPORT_VCN | +AMD_PG_SUPPORT_VCN_DPG ; adev->external_rev_id = adev->rev_id +0x91 ;if (adev->pm.pp_feature &PP_GFXOFF_MASK )
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Liu, Leo
Reviewed-by Leo LiuThis patch is:
Quoted 65 lines · Thong
This reverts commit
69fcd7347f6fb11edc7eaea7c7b9cff0044ce17e.--- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 9 +++------ drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 9 +++------ 2 files changed, 6 insertions(+), 12 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +3
-6@@ -84,8 +84,7 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev)case CHIP_RENOIR : fw_name =FIRMWARE_RENOIR ;if ((adev->firmware.load_type ==AMDGPU_FW_LOAD_PSP ) && - (adev->pg_flags &AMD_PG_SUPPORT_VCN_DPG ) && - adev->asic_type !=CHIP_RENOIR )/* to be removed while vcn psp loading works */ + (adev->pg_flags &AMD_PG_SUPPORT_VCN_DPG )) adev->vcn.indirect_sram = true;break ;default :@@ -139,8 +138,7 @@ 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 || - adev->asic_type ==CHIP_RENOIR ) +if (adev->firmware.load_type !=AMDGPU_FW_LOAD_PSP ) bo_size +=AMDGPU_GPU_PAGE_ALIGN (le32_to_cpu (hdr->ucode_size_bytes) +8 ); r = amdgpu_bo_create_kernel(adev, bo_size, PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM, &adev->vcn.vcpu_bo,@@ -233,8 +231,7 @@ int amdgpu_vcn_resume(struct amdgpu_device *adev)unsigned offset; hdr = (const struct common_firmware_header *)adev->vcn.fw->data; -if (adev->firmware.load_type !=AMDGPU_FW_LOAD_PSP || - adev->asic_type ==CHIP_RENOIR ) { +if (adev->firmware.load_type !=AMDGPU_FW_LOAD_PSP ) { offset =le32_to_cpu (hdr->ucode_array_offset_bytes);memcpy_toio (adev->vcn.cpu_addr, adev->vcn.fw->data + offset,le32_to_cpu (hdr->ucode_size_bytes));drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c +2
-4@@ -142,8 +142,7 @@ static int vcn_v2_0_sw_init(void *handle)if (r)return r; -if (adev->firmware.load_type ==AMDGPU_FW_LOAD_PSP && - adev->asic_type !=CHIP_RENOIR ) { +if (adev->firmware.load_type ==AMDGPU_FW_LOAD_PSP ) {const struct common_firmware_header *hdr; hdr = (const struct common_firmware_header *)adev->vcn.fw->data; adev->firmware.ucode[AMDGPU_UCODE_ID_VCN ].ucode_id =AMDGPU_UCODE_ID_VCN ;@@ -360,8 +359,7 @@ static void vcn_v2_0_mc_resume(struct amdgpu_device *adev)uint32_t offset;/* cache window 0: fw */ -if (adev->firmware.load_type ==AMDGPU_FW_LOAD_PSP && - adev->asic_type !=CHIP_RENOIR ) { +if (adev->firmware.load_type ==AMDGPU_FW_LOAD_PSP ) {WREG32_SOC15 (UVD ,0 , mmUVD_LMI_VCPU_CACHE_64BIT_BAR_LOW, (adev->firmware.ucode[AMDGPU_UCODE_ID_VCN ].tmr_mc_addr_lo)); WREG32_SOC15(UVD, 0, mmUVD_LMI_VCPU_CACHE_64BIT_BAR_HIGH,
drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c static void vcn_v2_0_mc_resume_dpg_mode(struct amdgpu_device *adev, bool indirec · line 410
Quoted 9 lines
drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c +1
-2@@ -406,8 +404,7 @@ static void vcn_v2_0_mc_resume_dpg_mode(struct amdgpu_device *adev, bool indirecuint32_t offset;/* cache window 0: fw */ -if (adev->firmware.load_type ==AMDGPU_FW_LOAD_PSP && - adev->asic_type !=CHIP_RENOIR ) { +if (adev->firmware.load_type ==AMDGPU_FW_LOAD_PSP ) {if (!indirect) { WREG32_SOC15_DPG_MODE_2_0(SOC15_DPG_MODE_OFFSET_2_0( UVD, 0, mmUVD_LMI_VCPU_CACHE_64BIT_BAR_LOW),
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx