drm/amdgpu/vcn2.5: fix PSP FW loading for the second instance
Subsystems (2)
PATCH 1/2 drm/amdgpu/vcn2.5: fix PSP FW loading for the second instance
ucodes for instances are from different location
Signed-off-by Leo Liu <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c +2 -2
@@ -384,9 +384,9 @@ static void vcn_v2_5_mc_resume(struct amdgpu_device *adev)/* cache window 0: fw */ if (adev->firmware.load_type ==AMDGPU_FW_LOAD_PSP ) {WREG32_SOC15 (UVD , i, mmUVD_LMI_VCPU_CACHE_64BIT_BAR_LOW, - (adev->firmware.ucode[AMDGPU_UCODE_ID_VCN ].tmr_mc_addr_lo)); + (adev->firmware.ucode[AMDGPU_UCODE_ID_VCN + i].tmr_mc_addr_lo));WREG32_SOC15 (UVD , i, mmUVD_LMI_VCPU_CACHE_64BIT_BAR_HIGH, - (adev->firmware.ucode[AMDGPU_UCODE_ID_VCN ].tmr_mc_addr_hi)); + (adev->firmware.ucode[AMDGPU_UCODE_ID_VCN + i].tmr_mc_addr_hi));WREG32_SOC15 (UVD , i, mmUVD_VCPU_CACHE_OFFSET0,0 ); offset =0 ; }else {
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/2 drm/amdgpu: enable VCN2.5 IP block for Arcturus
With default PSP FW loading
Signed-off-by Leo Liu <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/soc15.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/soc15.c +1 -2
@@ -834,8 +834,7 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)if (likely (adev->firmware.load_type ==AMDGPU_FW_LOAD_PSP ))amdgpu_device_ip_block_add (adev, &vcn_v2_5_ip_block); }else { -if (unlikely (adev->firmware.load_type ==AMDGPU_FW_LOAD_DIRECT )) -amdgpu_device_ip_block_add (adev, &vcn_v2_5_ip_block); +amdgpu_device_ip_block_add (adev, &vcn_v2_5_ip_block); }if (!amdgpu_sriov_vf (adev))amdgpu_device_ip_block_add (adev, &jpeg_v2_5_ip_block);
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Reviewed-by James Zhu <[email protected]> for the series
Quoted 13 lines · Leo Liu
ucodes for instances are from different location
Signed-off-by Leo Liu <[email protected]>--- drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c +0
-0@@ -384,9 +384,9 @@ static void vcn_v2_5_mc_resume(struct amdgpu_device *adev)/* cache window 0: fw */
drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c static void vcn_v2_5_mc_resume(struct amdgpu_device *adev) · line 392
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c +2
-2if (adev->firmware.load_type ==AMDGPU_FW_LOAD_PSP ) {WREG32_SOC15 (UVD , i, mmUVD_LMI_VCPU_CACHE_64BIT_BAR_LOW, - (adev->firmware.ucode[AMDGPU_UCODE_ID_VCN ].tmr_mc_addr_lo)); + (adev->firmware.ucode[AMDGPU_UCODE_ID_VCN + i].tmr_mc_addr_lo));WREG32_SOC15 (UVD , i, mmUVD_LMI_VCPU_CACHE_64BIT_BAR_HIGH, - (adev->firmware.ucode[AMDGPU_UCODE_ID_VCN ].tmr_mc_addr_hi)); + (adev->firmware.ucode[AMDGPU_UCODE_ID_VCN + i].tmr_mc_addr_hi));WREG32_SOC15 (UVD , i, mmUVD_VCPU_CACHE_OFFSET0,0 ); offset =0 ; }else {
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx