diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.19.8/0761-drm-amdgpu-psp-initialize-xgmi-session-v2.patch')
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.19.8/0761-drm-amdgpu-psp-initialize-xgmi-session-v2.patch | 140 |
1 files changed, 140 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.19.8/0761-drm-amdgpu-psp-initialize-xgmi-session-v2.patch b/common/recipes-kernel/linux/linux-yocto-4.19.8/0761-drm-amdgpu-psp-initialize-xgmi-session-v2.patch new file mode 100644 index 00000000..7e10bec1 --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.19.8/0761-drm-amdgpu-psp-initialize-xgmi-session-v2.patch @@ -0,0 +1,140 @@ +From 4588534cac4055fe934fb99cc703b0561d01dc4e Mon Sep 17 00:00:00 2001 +From: Hawking Zhang <Hawking.Zhang@amd.com> +Date: Fri, 28 Sep 2018 21:28:10 +0800 +Subject: [PATCH 0761/2940] drm/amdgpu/psp: initialize xgmi session (v2) + +Setup and tear down xgmi as part of psp. + +v2: +- make psp_xgmi_terminate static +- squash in: +drm/amdgpu: only issue xgmi cmd when it is enabled +drm/amdgpu/psp: terminate xgmi ta in suspend and hw_fini phase + +Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com> +Acked-by: Alex Deucher <alexander.deucher@amd.com> +Reviewed-by: Huang Rui <ray.huang@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 69 ++++++++++++++++++++++ + 2 files changed, 71 insertions(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +index f2bf778fa256..f3c02edd61d8 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +@@ -1731,7 +1731,8 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev) + if (r) + return r; + +- amdgpu_xgmi_add_device(adev); ++ if (adev->gmc.xgmi.num_physical_nodes > 1) ++ amdgpu_xgmi_add_device(adev); + amdgpu_amdkfd_device_init(adev); + + if (amdgpu_sriov_vf(adev)) +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +index c4dc935e2f80..bbd1b427425c 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +@@ -411,6 +411,53 @@ int psp_xgmi_invoke(struct psp_context *psp, uint32_t ta_cmd_id) + return ret; + } + ++static int psp_xgmi_terminate(struct psp_context *psp) ++{ ++ int ret; ++ ++ if (!psp->xgmi_context.initialized) ++ return 0; ++ ++ ret = psp_xgmi_unload(psp); ++ if (ret) ++ return ret; ++ ++ psp->xgmi_context.initialized = 0; ++ ++ /* free xgmi shared memory */ ++ amdgpu_bo_free_kernel(&psp->xgmi_context.xgmi_shared_bo, ++ &psp->xgmi_context.xgmi_shared_mc_addr, ++ &psp->xgmi_context.xgmi_shared_buf); ++ ++ return 0; ++} ++ ++static int psp_xgmi_initialize(struct psp_context *psp) ++{ ++ struct ta_xgmi_shared_memory *xgmi_cmd; ++ int ret; ++ ++ if (!psp->xgmi_context.initialized) { ++ ret = psp_xgmi_init_shared_buf(psp); ++ if (ret) ++ return ret; ++ } ++ ++ /* Load XGMI TA */ ++ ret = psp_xgmi_load(psp); ++ if (ret) ++ return ret; ++ ++ /* Initialize XGMI session */ ++ xgmi_cmd = (struct ta_xgmi_shared_memory *)(psp->xgmi_context.xgmi_shared_buf); ++ memset(xgmi_cmd, 0, sizeof(struct ta_xgmi_shared_memory)); ++ xgmi_cmd->cmd_id = TA_COMMAND_XGMI__INITIALIZE; ++ ++ ret = psp_xgmi_invoke(psp, xgmi_cmd->cmd_id); ++ ++ return ret; ++} ++ + static int psp_hw_start(struct psp_context *psp) + { + struct amdgpu_device *adev = psp->adev; +@@ -438,6 +485,15 @@ static int psp_hw_start(struct psp_context *psp) + if (ret) + return ret; + ++ if (adev->gmc.xgmi.num_physical_nodes > 1) { ++ ret = psp_xgmi_initialize(psp); ++ /* Warning the XGMI seesion initialize failure ++ * Instead of stop driver initialization ++ */ ++ if (ret) ++ dev_err(psp->adev->dev, ++ "XGMI: Failed to initialize XGMI session\n"); ++ } + return 0; + } + +@@ -598,6 +654,10 @@ static int psp_hw_fini(void *handle) + if (adev->firmware.load_type != AMDGPU_FW_LOAD_PSP) + return 0; + ++ if (adev->gmc.xgmi.num_physical_nodes > 1 && ++ psp->xgmi_context.initialized == 1) ++ psp_xgmi_terminate(psp); ++ + psp_ring_destroy(psp, PSP_RING_TYPE__KM); + + amdgpu_bo_free_kernel(&psp->tmr_bo, &psp->tmr_mc_addr, &psp->tmr_buf); +@@ -625,6 +685,15 @@ static int psp_suspend(void *handle) + if (adev->firmware.load_type != AMDGPU_FW_LOAD_PSP) + return 0; + ++ if (adev->gmc.xgmi.num_physical_nodes > 1 && ++ psp->xgmi_context.initialized == 1) { ++ ret = psp_xgmi_terminate(psp); ++ if (ret) { ++ DRM_ERROR("Failed to terminate xgmi ta\n"); ++ return ret; ++ } ++ } ++ + ret = psp_ring_stop(psp, PSP_RING_TYPE__KM); + if (ret) { + DRM_ERROR("PSP ring stop failed\n"); +-- +2.17.1 + |