drm/amdgpu:Change VCE booting with firmware loaded by PSP
Subsystems (2)
PATCH 1/3 drm/amdgpu:Change VCE booting with firmware loaded by PSP
With PSP firmware loading, TMR mc address is supposed to be used.
--- drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/vce_v4_0.c +9 -4
@@ -593,6 +593,7 @@ static int vce_v4_0_resume(void *handle)static void vce_v4_0_mc_resume (struct amdgpu_device *adev) {uint32_t offset, size; +uint64_t tmr_mc_addr;WREG32_P (SOC15_REG_OFFSET (VCE ,0 , mmVCE_CLOCK_GATING_A),0 , ~(1 <<16 ));WREG32_P (SOC15_REG_OFFSET (VCE ,0 , mmVCE_UENC_CLOCK_GATING),0x1FF000 , ~0xFF9FF000 );
@@ -605,21 +606,25 @@ static void vce_v4_0_mc_resume(struct amdgpu_device *adev)WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_LMI_SWAP_CNTL1),0 );WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_LMI_VM_CTRL),0 ); + offset =AMDGPU_VCE_FIRMWARE_OFFSET ; +if (adev->firmware.load_type ==AMDGPU_FW_LOAD_PSP ) { + tmr_mc_addr = (uint64_t )(adev->firmware.ucode[AMDGPU_UCODE_ID_VCE ].tmr_mc_addr_hi) <<32 | + adev->firmware.ucode[AMDGPU_UCODE_ID_VCE ].tmr_mc_addr_lo;WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_LMI_VCPU_CACHE_40BIT_BAR0), - (adev->firmware.ucode[AMDGPU_UCODE_ID_VCE ].mc_addr >>8 )); + (tmr_mc_addr >>8 ));WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_LMI_VCPU_CACHE_64BIT_BAR0), - (adev->firmware.ucode[AMDGPU_UCODE_ID_VCE ].mc_addr >>40 ) &0xff ); + (tmr_mc_addr >>40 ) &0xff ); +WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_VCPU_CACHE_OFFSET0),0 ); }else {WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_LMI_VCPU_CACHE_40BIT_BAR0), (adev->vce.gpu_addr >>8 ));WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_LMI_VCPU_CACHE_64BIT_BAR0), (adev->vce.gpu_addr >>40 ) &0xff ); +WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_VCPU_CACHE_OFFSET0), offset & ~0x0f000000 ); } - offset =AMDGPU_VCE_FIRMWARE_OFFSET ; size =VCE_V4_0_FW_SIZE ; -WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_VCPU_CACHE_OFFSET0), offset & ~0x0f000000 );WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_VCPU_CACHE_SIZE0), size);WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_LMI_VCPU_CACHE_40BIT_BAR1), (adev->vce.gpu_addr >>8 ));
Signature · 6 lines
2.7.4 _______________________________________________ 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): 1534272833-24618-1-git-send-email-James.Zhu-5C7GfCeVMHo@public.gmane.org
PATCH 2/3 drm/amdgpu: added support 2nd UVD instance
From: Evan Quan <[email protected]>
Added psp fw loading support for vega20 2nd UVD instance.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 1 + drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 3 ++- drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 3 +++ drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 7 +++++++ 4 files changed, 13 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h +1 -0
@@ -194,6 +194,7 @@ enum AMDGPU_UCODE_ID {AMDGPU_UCODE_ID_SMC ,AMDGPU_UCODE_ID_UVD ,AMDGPU_UCODE_ID_VCE , +AMDGPU_UCODE_ID_UVD1 , AMDGPU_UCODE_ID_MAXIMUM, };
drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h +2 -1
@@ -189,7 +189,8 @@ enum psp_gfx_fw_typeGFX_FW_TYPE_RLC_RESTORE_LIST_GPM_MEM =20 ,GFX_FW_TYPE_RLC_RESTORE_LIST_SRM_MEM =21 ,GFX_FW_TYPE_RLC_RESTORE_LIST_CNTL =22 , - GFX_FW_TYPE_MAX = 23 +GFX_FW_TYPE_UVD1 =23 , + GFX_FW_TYPE_MAX = 24 };/* Command to load HW IP FW. */
drivers/gpu/drm/amd/amdgpu/psp_v11_0.c +3 -0
@@ -81,6 +81,9 @@ psp_v11_0_get_fw_type(struct amdgpu_firmware_info *ucode, enum psp_gfx_fw_type *case AMDGPU_UCODE_ID_VCE : *type =GFX_FW_TYPE_VCE ;break ; +case AMDGPU_UCODE_ID_UVD1 : + *type =GFX_FW_TYPE_UVD1 ; +break ;case AMDGPU_UCODE_ID_MAXIMUM :default :return -EINVAL ;
drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c +7 -0
@@ -428,6 +428,13 @@ static int uvd_v7_0_sw_init(void *handle) adev->firmware.ucode[AMDGPU_UCODE_ID_UVD ].fw = adev->uvd.fw; adev->firmware.fw_size +=ALIGN (le32_to_cpu (hdr->ucode_size_bytes),PAGE_SIZE ); + +if (adev->uvd.num_uvd_inst ==UVD7_MAX_HW_INSTANCES_VEGA20 ) { + adev->firmware.ucode[AMDGPU_UCODE_ID_UVD1 ].ucode_id =AMDGPU_UCODE_ID_UVD1 ; + adev->firmware.ucode[AMDGPU_UCODE_ID_UVD1 ].fw = adev->uvd.fw; + adev->firmware.fw_size += +ALIGN (le32_to_cpu (hdr->ucode_size_bytes),PAGE_SIZE ); + }DRM_INFO ("PSP loading UVD firmware\n" ); }
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/3 drm/amdgpu:change VEGA booting with firmware loaded by PSP
In reply to a message not in the archiveFrom: Feifei Xu <[email protected]>
With PSP firmware loading, TMR mc address is supposed to be used.
--- drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c +9 -4
@@ -656,9 +656,14 @@ static void uvd_v7_0_mc_resume(struct amdgpu_device *adev)for (i =0 ; i < adev->uvd.num_uvd_inst; ++i) {if (adev->firmware.load_type ==AMDGPU_FW_LOAD_PSP ) {WREG32_SOC15 (UVD , i, mmUVD_LMI_VCPU_CACHE_64BIT_BAR_LOW, -lower_32_bits (adev->firmware.ucode[AMDGPU_UCODE_ID_UVD ].mc_addr)); + i ==0 ? + adev->firmware.ucode[AMDGPU_UCODE_ID_UVD ].tmr_mc_addr_lo: + adev->firmware.ucode[AMDGPU_UCODE_ID_UVD1 ].tmr_mc_addr_lo);WREG32_SOC15 (UVD , i, mmUVD_LMI_VCPU_CACHE_64BIT_BAR_HIGH, -upper_32_bits (adev->firmware.ucode[AMDGPU_UCODE_ID_UVD ].mc_addr)); + i ==0 ? + adev->firmware.ucode[AMDGPU_UCODE_ID_UVD ].tmr_mc_addr_hi: + adev->firmware.ucode[AMDGPU_UCODE_ID_UVD1 ].tmr_mc_addr_hi); +WREG32_SOC15 (UVD , i, mmUVD_VCPU_CACHE_OFFSET0,0 ); offset =0 ; }else { WREG32_SOC15(UVD, i, mmUVD_LMI_VCPU_CACHE_64BIT_BAR_LOW,
@@ -666,10 +671,10 @@ static void uvd_v7_0_mc_resume(struct amdgpu_device *adev)WREG32_SOC15 (UVD , i, mmUVD_LMI_VCPU_CACHE_64BIT_BAR_HIGH,upper_32_bits (adev->uvd.inst[i].gpu_addr)); offset = size; +WREG32_SOC15 (UVD , i, mmUVD_VCPU_CACHE_OFFSET0, +AMDGPU_UVD_FIRMWARE_OFFSET >>3 ); } -WREG32_SOC15 (UVD , i, mmUVD_VCPU_CACHE_OFFSET0, -AMDGPU_UVD_FIRMWARE_OFFSET >>3 );WREG32_SOC15 (UVD , i, mmUVD_VCPU_CACHE_SIZE0, size); WREG32_SOC15(UVD, i, mmUVD_LMI_VCPU_CACHE1_64BIT_BAR_LOW,
Signature · 6 lines
2.7.4 _______________________________________________ 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): 1534272833-24618-3-git-send-email-James.Zhu-5C7GfCeVMHo@public.gmane.org
Alex Deucher
Reviewed-byRe: [PATCH 3/3] drm/amdgpu:change VEGA booting with firmware loaded by PSP
Quoted 6 lines · James Zhu
From: Feifei Xu <[email protected]>
With PSP firmware loading, TMR mc address is supposed to be used.
Signed-off-by James Zhu <[email protected]>
Series is:
Quoted 41 lines
--- drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c +9
-5@@ -656,9 +656,14 @@ static void uvd_v7_0_mc_resume(struct amdgpu_device *adev)for (i =0 ; i < adev->uvd.num_uvd_inst; ++i) {if (adev->firmware.load_type ==AMDGPU_FW_LOAD_PSP ) {WREG32_SOC15 (UVD , i, mmUVD_LMI_VCPU_CACHE_64BIT_BAR_LOW, -lower_32_bits (adev->firmware.ucode[AMDGPU_UCODE_ID_UVD ].mc_addr)); + i ==0 ? + adev->firmware.ucode[AMDGPU_UCODE_ID_UVD ].tmr_mc_addr_lo: + adev->firmware.ucode[AMDGPU_UCODE_ID_UVD1 ].tmr_mc_addr_lo);WREG32_SOC15 (UVD , i, mmUVD_LMI_VCPU_CACHE_64BIT_BAR_HIGH, -upper_32_bits (adev->firmware.ucode[AMDGPU_UCODE_ID_UVD ].mc_addr)); + i ==0 ? + adev->firmware.ucode[AMDGPU_UCODE_ID_UVD ].tmr_mc_addr_hi: + adev->firmware.ucode[AMDGPU_UCODE_ID_UVD1 ].tmr_mc_addr_hi); +WREG32_SOC15 (UVD , i, mmUVD_VCPU_CACHE_OFFSET0,0 ); offset =0 ; }else { WREG32_SOC15(UVD, i, mmUVD_LMI_VCPU_CACHE_64BIT_BAR_LOW,@@ -666,10 +671,10 @@ static void uvd_v7_0_mc_resume(struct amdgpu_device *adev)WREG32_SOC15 (UVD , i, mmUVD_LMI_VCPU_CACHE_64BIT_BAR_HIGH,upper_32_bits (adev->uvd.inst[i].gpu_addr)); offset = size; +WREG32_SOC15 (UVD , i, mmUVD_VCPU_CACHE_OFFSET0, +AMDGPU_UVD_FIRMWARE_OFFSET >>3 ); } -WREG32_SOC15 (UVD , i, mmUVD_VCPU_CACHE_OFFSET0, -AMDGPU_UVD_FIRMWARE_OFFSET >>3 );WREG32_SOC15 (UVD , i, mmUVD_VCPU_CACHE_SIZE0, size); WREG32_SOC15(UVD, i, mmUVD_LMI_VCPU_CACHE1_64BIT_BAR_LOW, --2.7.4
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Huang Rui
Acked-byQuoted 2 lines · James Zhu
With PSP firmware loading, TMR mc address is supposed to be used.
Signed-off-by James Zhu <[email protected]>
Series are
Quoted 53 lines
--- drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)drivers/gpu/drm/amd/amdgpu/vce_v4_0.c +9
-4@@ -593,6 +593,7 @@ static int vce_v4_0_resume(void *handle)static void vce_v4_0_mc_resume (struct amdgpu_device *adev) {uint32_t offset, size; +uint64_t tmr_mc_addr;WREG32_P (SOC15_REG_OFFSET (VCE ,0 , mmVCE_CLOCK_GATING_A),0 , ~(1 <<16 ));WREG32_P (SOC15_REG_OFFSET (VCE ,0 , mmVCE_UENC_CLOCK_GATING),0x1FF000 , ~0xFF9FF000 );@@ -605,21 +606,25 @@ static void vce_v4_0_mc_resume(struct amdgpu_device *adev)WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_LMI_SWAP_CNTL1),0 );WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_LMI_VM_CTRL),0 ); + offset =AMDGPU_VCE_FIRMWARE_OFFSET ; +if (adev->firmware.load_type ==AMDGPU_FW_LOAD_PSP ) { + tmr_mc_addr = (uint64_t )(adev->firmware.ucode[AMDGPU_UCODE_ID_VCE ].tmr_mc_addr_hi) <<32 | + adev->firmware.ucode[AMDGPU_UCODE_ID_VCE ].tmr_mc_addr_lo;WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_LMI_VCPU_CACHE_40BIT_BAR0), - (adev->firmware.ucode[AMDGPU_UCODE_ID_VCE ].mc_addr >>8 )); + (tmr_mc_addr >>8 ));WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_LMI_VCPU_CACHE_64BIT_BAR0), - (adev->firmware.ucode[AMDGPU_UCODE_ID_VCE ].mc_addr >>40 ) &0xff ); + (tmr_mc_addr >>40 ) &0xff ); +WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_VCPU_CACHE_OFFSET0),0 ); }else {WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_LMI_VCPU_CACHE_40BIT_BAR0), (adev->vce.gpu_addr >>8 ));WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_LMI_VCPU_CACHE_64BIT_BAR0), (adev->vce.gpu_addr >>40 ) &0xff ); +WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_VCPU_CACHE_OFFSET0), offset & ~0x0f000000 ); } - offset =AMDGPU_VCE_FIRMWARE_OFFSET ; size =VCE_V4_0_FW_SIZE ; -WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_VCPU_CACHE_OFFSET0), offset & ~0x0f000000 );WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_VCPU_CACHE_SIZE0), size);WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_LMI_VCPU_CACHE_40BIT_BAR1), (adev->vce.gpu_addr >>8 ));Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx