drm/amdgpu: add psp ip block for arct
Subsystems (2)
PATCH 1/1 drm/amdgpu: add psp ip block for arct
enable psp block for firmware loading and other security feature setup.
--- drivers/gpu/drm/amd/amdgpu/soc15.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/amdgpu/soc15.c +2 -0
@@ -755,6 +755,8 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)amdgpu_device_ip_block_add (adev, &vega10_common_ip_block);amdgpu_device_ip_block_add (adev, &gmc_v9_0_ip_block);amdgpu_device_ip_block_add (adev, &vega10_ih_ip_block); +if (likely (adev->firmware.load_type ==AMDGPU_FW_LOAD_PSP )) +amdgpu_device_ip_block_add (adev, &psp_v11_0_ip_block);if (adev->enable_virtual_display ||amdgpu_sriov_vf (adev))amdgpu_device_ip_block_add (adev, &dce_virtual_ip_block);amdgpu_device_ip_block_add (adev, &gfx_v9_0_ip_block);
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 1/1 drm/amdgpu: do not init mec2 jt for renoir
For ASICs like renoir/arct, driver doesn't need to load mec2 jt. when mec1 jt is loaded, mec2 jt will be loaded automatically since the write is actaully broadcasted to both.
We need to more time to test other gfx9 asic. but for now we should be able to draw conclusion that mec2 jt is not needed for renoir and arct.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 4 ---- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 3 ++- 2 files changed, 2 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +0 -4
@@ -1068,10 +1068,6 @@ static int psp_np_fw_load(struct psp_context *psp) ucode->ucode_id == AMDGPU_UCODE_ID_CP_MEC2_JT))/* skip mec JT when autoload is enabled */ continue ; -/* Renoir only needs to load mec jump table one time */ -if (adev->asic_type ==CHIP_RENOIR && - ucode->ucode_id ==AMDGPU_UCODE_ID_CP_MEC2_JT ) -continue ;psp_print_fw_hdr (psp, ucode);
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +2 -1
@@ -1321,7 +1321,8 @@ static int gfx_v9_0_init_cp_compute_microcode(struct amdgpu_device *adev,/* TODO: Determine if MEC2 JT FW loading can be removed for all GFX V9 asic and above */ -if (adev->asic_type !=CHIP_ARCTURUS ) { +if (adev->asic_type !=CHIP_ARCTURUS && + adev->asic_type !=CHIP_RENOIR ) { info = &adev->firmware.ucode[AMDGPU_UCODE_ID_CP_MEC2_JT ]; info->ucode_id =AMDGPU_UCODE_ID_CP_MEC2_JT ; info->fw = adev->gfx.mec2_fw;
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]
Xu, Feifei
Reviewed-by Feifei XuRE: [PATCH] drm/amdgpu: do not init mec2 jt for renoir
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Zhang, Hawking
Sent: Wednesday, September 18, 2019 7:09 AM
To: [email protected]; Deucher, Alexander <[email protected]>; Clements, John <[email protected]>
Cc: Zhang, Hawking <[email protected]>
Subject: [PATCH] drm/amdgpu: do not init mec2 jt for renoir
For ASICs like renoir/arct, driver doesn't need to load mec2 jt.
when mec1 jt is loaded, mec2 jt will be loaded automatically since the write is actaully broadcasted to both.
We need to more time to test other gfx9 asic. but for now we should be able to draw conclusion that mec2 jt is not needed for renoir and arct.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 4 ---- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 3 ++- 2 files changed, 2 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +0 -4
@@ -1068,10 +1068,6 @@ static int psp_np_fw_load(struct psp_context *psp) ucode->ucode_id == AMDGPU_UCODE_ID_CP_MEC2_JT))/* skip mec JT when autoload is enabled */ continue ; -/* Renoir only needs to load mec jump table one time */ -if (adev->asic_type ==CHIP_RENOIR && - ucode->ucode_id ==AMDGPU_UCODE_ID_CP_MEC2_JT ) -continue ;psp_print_fw_hdr (psp, ucode);
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +2 -1
@@ -1321,7 +1321,8 @@ static int gfx_v9_0_init_cp_compute_microcode(struct amdgpu_device *adev,/* TODO: Determine if MEC2 JT FW loading can be removed for all GFX V9 asic and above */ -if (adev->asic_type !=CHIP_ARCTURUS ) { +if (adev->asic_type !=CHIP_ARCTURUS && + adev->asic_type !=CHIP_RENOIR ) { info = &adev->firmware.ucode[AMDGPU_UCODE_ID_CP_MEC2_JT ]; info->ucode_id =AMDGPU_UCODE_ID_CP_MEC2_JT ; info->fw = adev->gfx.mec2_fw;
--
2.17.1
_______________________________________________
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
Xu, Feifei
Reviewed-by Feifei Xu-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Zhang, Hawking
Sent: Wednesday, September 18, 2019 7:09 AM
To: [email protected]; Deucher, Alexander <[email protected]>; Clements, John <[email protected]>
Cc: Zhang, Hawking <[email protected]>
Subject: [PATCH] drm/amdgpu: add psp ip block for arct
enable psp block for firmware loading and other security feature setup.
--- drivers/gpu/drm/amd/amdgpu/soc15.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/amdgpu/soc15.c +2 -0
@@ -755,6 +755,8 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)amdgpu_device_ip_block_add (adev, &vega10_common_ip_block);amdgpu_device_ip_block_add (adev, &gmc_v9_0_ip_block);amdgpu_device_ip_block_add (adev, &vega10_ih_ip_block); +if (likely (adev->firmware.load_type ==AMDGPU_FW_LOAD_PSP )) +amdgpu_device_ip_block_add (adev, &psp_v11_0_ip_block);if (adev->enable_virtual_display ||amdgpu_sriov_vf (adev))amdgpu_device_ip_block_add (adev, &dce_virtual_ip_block);amdgpu_device_ip_block_add (adev, &gfx_v9_0_ip_block);
--
2.17.1
_______________________________________________
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