drm amdgpu: Skip tmr load for SRIOV
Subsystems (2)
PATCH 1/1 drm amdgpu: Skip tmr load for SRIOV
From: root <[email protected]>
1. For Navi12, Navi21, skip tmr load operation;
2. Check pointer before release firmware.
Signed-off-by root <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 40 +++++++++++++++++++++---- 1 file changed, 34 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +34 -6
@@ -193,12 +193,18 @@ static int psp_sw_fini(void *handle)struct amdgpu_device *adev = (struct amdgpu_device *)handle;psp_memory_training_fini (&adev->psp); -release_firmware (adev->psp.sos_fw); - adev->psp.sos_fw =NULL ; -release_firmware (adev->psp.asd_fw); - adev->psp.asd_fw =NULL ; -release_firmware (adev->psp.ta_fw); - adev->psp.ta_fw =NULL ; +if (adev->psp.sos_fw) { +release_firmware (adev->psp.sos_fw); + adev->psp.sos_fw =NULL ; + } +if (adev->psp.asd_fw) { +release_firmware (adev->psp.asd_fw); + adev->psp.asd_fw =NULL ; + } +if (adev->psp.ta_fw) { +release_firmware (adev->psp.ta_fw); + adev->psp.ta_fw =NULL ; + }if (adev->asic_type ==CHIP_NAVI10 )psp_sysfs_fini (adev);
@@ -409,11 +415,33 @@ static int psp_clear_vf_fw(struct psp_context *psp)return ret; } +static bool psp_skip_tmr (struct psp_context *psp) +{ +bool ret = false; + +switch (psp->adev->asic_type) { +case CHIP_NAVI12 : +case CHIP_SIENNA_CICHLID : + ret = true; +break ; +default : +return false; + } + +return ret; +} +static int psp_tmr_load (struct psp_context *psp) {int ret;struct psp_gfx_cmd_resp *cmd; +/* for Navi12 and Navi21 SRIOV, do not setup TMR +* (already setup by host driver) +*/ +if (amdgpu_sriov_vf (psp->adev) &&psp_skip_tmr (psp)) +return 0 ; + cmd =kzalloc (sizeof (struct psp_gfx_cmd_resp ),GFP_KERNEL );if (!cmd)return -ENOMEM ;
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx