diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.19.8/0953-drm-amdgpu-correct-the-return-value-for-error-case.patch')
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.19.8/0953-drm-amdgpu-correct-the-return-value-for-error-case.patch | 123 |
1 files changed, 123 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.19.8/0953-drm-amdgpu-correct-the-return-value-for-error-case.patch b/common/recipes-kernel/linux/linux-yocto-4.19.8/0953-drm-amdgpu-correct-the-return-value-for-error-case.patch new file mode 100644 index 00000000..d53b60a1 --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.19.8/0953-drm-amdgpu-correct-the-return-value-for-error-case.patch @@ -0,0 +1,123 @@ +From 40be076d64e9240927b5474e04b7f46700941aa9 Mon Sep 17 00:00:00 2001 +From: Evan Quan <evan.quan@amd.com> +Date: Mon, 17 Dec 2018 17:51:22 +0800 +Subject: [PATCH 0953/2940] drm/amdgpu: correct the return value for error case + +It should not return 0 for error case as '0' is actually +a special value for index. + +Signed-off-by: Evan Quan <evan.quan@amd.com> +Reviewed-by: Alex Deucher <alexander.deucher@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 12 ++++++------ + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 15 +++++++++++++-- + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 20 ++++++++++++-------- + 3 files changed, 31 insertions(+), 16 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h +index fa7dfbd97453..3ee573b4016e 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h +@@ -83,8 +83,8 @@ struct psp_funcs + enum AMDGPU_UCODE_ID ucode_type); + bool (*smu_reload_quirk)(struct psp_context *psp); + int (*mode1_reset)(struct psp_context *psp); +- uint64_t (*xgmi_get_node_id)(struct psp_context *psp); +- uint64_t (*xgmi_get_hive_id)(struct psp_context *psp); ++ int (*xgmi_get_node_id)(struct psp_context *psp, uint64_t *node_id); ++ int (*xgmi_get_hive_id)(struct psp_context *psp, uint64_t *hive_id); + int (*xgmi_get_topology_info)(struct psp_context *psp, int number_devices, + struct psp_xgmi_topology_info *topology); + int (*xgmi_set_topology_info)(struct psp_context *psp, int number_devices, +@@ -197,10 +197,10 @@ struct psp_xgmi_topology_info { + ((psp)->funcs->support_vmr_ring ? (psp)->funcs->support_vmr_ring((psp)) : false) + #define psp_mode1_reset(psp) \ + ((psp)->funcs->mode1_reset ? (psp)->funcs->mode1_reset((psp)) : false) +-#define psp_xgmi_get_node_id(psp) \ +- ((psp)->funcs->xgmi_get_node_id ? (psp)->funcs->xgmi_get_node_id((psp)) : 0) +-#define psp_xgmi_get_hive_id(psp) \ +- ((psp)->funcs->xgmi_get_hive_id ? (psp)->funcs->xgmi_get_hive_id((psp)) : 0) ++#define psp_xgmi_get_node_id(psp, node_id) \ ++ ((psp)->funcs->xgmi_get_node_id ? (psp)->funcs->xgmi_get_node_id((psp), (node_id)) : -EINVAL) ++#define psp_xgmi_get_hive_id(psp, hive_id) \ ++ ((psp)->funcs->xgmi_get_hive_id ? (psp)->funcs->xgmi_get_hive_id((psp), (hive_id)) : -EINVAL) + #define psp_xgmi_get_topology_info(psp, num_device, topology) \ + ((psp)->funcs->xgmi_get_topology_info ? \ + (psp)->funcs->xgmi_get_topology_info((psp), (num_device), (topology)) : -EINVAL) +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c +index 0b263a9857c6..8a8bc60cb6b4 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c +@@ -97,8 +97,19 @@ int amdgpu_xgmi_add_device(struct amdgpu_device *adev) + if (!adev->gmc.xgmi.supported) + return 0; + +- adev->gmc.xgmi.node_id = psp_xgmi_get_node_id(&adev->psp); +- adev->gmc.xgmi.hive_id = psp_xgmi_get_hive_id(&adev->psp); ++ ret = psp_xgmi_get_node_id(&adev->psp, &adev->gmc.xgmi.node_id); ++ if (ret) { ++ dev_err(adev->dev, ++ "XGMI: Failed to get node id\n"); ++ return ret; ++ } ++ ++ ret = psp_xgmi_get_hive_id(&adev->psp, &adev->gmc.xgmi.hive_id); ++ if (ret) { ++ dev_err(adev->dev, ++ "XGMI: Failed to get hive id\n"); ++ return ret; ++ } + + mutex_lock(&xgmi_mutex); + hive = amdgpu_get_xgmi_hive(adev); +diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c +index 40a224ec4cb4..f1137c6a3320 100644 +--- a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c +@@ -697,7 +697,7 @@ static int psp_v11_0_xgmi_set_topology_info(struct psp_context *psp, + return psp_xgmi_invoke(psp, TA_COMMAND_XGMI__SET_TOPOLOGY_INFO); + } + +-static u64 psp_v11_0_xgmi_get_hive_id(struct psp_context *psp) ++static int psp_v11_0_xgmi_get_hive_id(struct psp_context *psp, uint64_t *hive_id) + { + struct ta_xgmi_shared_memory *xgmi_cmd; + int ret; +@@ -710,12 +710,14 @@ static u64 psp_v11_0_xgmi_get_hive_id(struct psp_context *psp) + /* Invoke xgmi ta to get hive id */ + ret = psp_xgmi_invoke(psp, xgmi_cmd->cmd_id); + if (ret) +- return 0; +- else +- return xgmi_cmd->xgmi_out_message.get_hive_id.hive_id; ++ return ret; ++ ++ *hive_id = xgmi_cmd->xgmi_out_message.get_hive_id.hive_id; ++ ++ return 0; + } + +-static u64 psp_v11_0_xgmi_get_node_id(struct psp_context *psp) ++static int psp_v11_0_xgmi_get_node_id(struct psp_context *psp, uint64_t *node_id) + { + struct ta_xgmi_shared_memory *xgmi_cmd; + int ret; +@@ -728,9 +730,11 @@ static u64 psp_v11_0_xgmi_get_node_id(struct psp_context *psp) + /* Invoke xgmi ta to get the node id */ + ret = psp_xgmi_invoke(psp, xgmi_cmd->cmd_id); + if (ret) +- return 0; +- else +- return xgmi_cmd->xgmi_out_message.get_node_id.node_id; ++ return ret; ++ ++ *node_id = xgmi_cmd->xgmi_out_message.get_node_id.node_id; ++ ++ return 0; + } + + static const struct psp_funcs psp_v11_0_funcs = { +-- +2.17.1 + |