drm/amdgpu: use node_id and node_size to calcualte dram_base_address
Subsystems (2)
PATCH 1/1 drm/amdgpu: use node_id and node_size to calcualte dram_base_address
physical_node_id * node_segment_size should be the dram_base_address for current gpu node in xgmi config
--- drivers/gpu/drm/amd/amdgpu/amdgpu_df.h | 3 -- drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 27 ++-------------- drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 54 -------------------------------- 3 files changed, 2 insertions(+), 82 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_df.h +0 -3
@@ -52,9 +52,6 @@ struct amdgpu_df_funcs {uint64_t (*get_fica)(struct amdgpu_device *adev,uint32_t ficaa_val);void (*set_fica)(struct amdgpu_device *adev,uint32_t ficaa_val,uint32_t ficadl_val,uint32_t ficadh_val); -uint64_t (*get_dram_base_addr)(struct amdgpu_device *adev, -uint32_t df_inst); -uint32_t (*get_df_inst_id)(struct amdgpu_device *adev); };struct amdgpu_df {
drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c +2 -25
@@ -649,31 +649,8 @@ void amdgpu_xgmi_ras_fini(struct amdgpu_device *adev)uint64_t amdgpu_xgmi_get_relative_phy_addr (struct amdgpu_device *adev,uint64_t addr) { -uint32_t df_inst_id; -uint64_t dram_base_addr =0 ; -const struct amdgpu_df_funcs *df_funcs = adev->df.funcs; - -if ((!df_funcs) || - (!df_funcs->get_df_inst_id) || - (!df_funcs->get_dram_base_addr)) { -dev_warn (adev->dev, -"XGMI: relative phy_addr algorithm is not supported\n" ); -return addr; - } - -if (amdgpu_dpm_set_df_cstate (adev,DF_CSTATE_DISALLOW )) { -dev_warn (adev->dev, -"failed to disable DF-Cstate, DF register may not be accessible\n" ); -return addr; - } - - df_inst_id = df_funcs->get_df_inst_id (adev); - dram_base_addr = df_funcs->get_dram_base_addr (adev, df_inst_id); - -if (amdgpu_dpm_set_df_cstate (adev,DF_CSTATE_ALLOW )) -dev_warn (adev->dev,"failed to enable DF-Cstate\n" ); - -return addr + dram_base_addr; +struct amdgpu_xgmi *xgmi = &adev->gmc.xgmi; +return (addr + xgmi->physical_node_id * xgmi->node_segment_size); }static void pcs_clear_status (struct amdgpu_device *adev,uint32_t pcs_status_reg)
drivers/gpu/drm/amd/amdgpu/df_v3_6.c +0 -54
64 lines not on this page · raw message
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[AMD Official Use Only - Internal Distribution Only]
-----Original Message-----
From: Hawking Zhang <[email protected]>
Sent: Wednesday, May 6, 2020 2:42 PM
To: [email protected]; Deucher, Alexander <[email protected]>; Clements, John <[email protected]>
Cc: Zhang, Hawking <[email protected]>
Subject: [PATCH] drm/amdgpu: use node_id and node_size to calcualte dram_base_address
physical_node_id * node_segment_size should be the dram_base_address for current gpu node in xgmi config
--- drivers/gpu/drm/amd/amdgpu/amdgpu_df.h | 3 -- drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 27 ++-------------- drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 54 -------------------------------- 3 files changed, 2 insertions(+), 82 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_df.h +0 -3
@@ -52,9 +52,6 @@ struct amdgpu_df_funcs {uint64_t (*get_fica)(struct amdgpu_device *adev,uint32_t ficaa_val);void (*set_fica)(struct amdgpu_device *adev,uint32_t ficaa_val,uint32_t ficadl_val,uint32_t ficadh_val); -uint64_t (*get_dram_base_addr)(struct amdgpu_device *adev, -uint32_t df_inst); -uint32_t (*get_df_inst_id)(struct amdgpu_device *adev); };struct amdgpu_df {
drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c +2 -25
@@ -649,31 +649,8 @@ void amdgpu_xgmi_ras_fini(struct amdgpu_device *adev) uint64_t amdgpu_xgmi_get_relative_phy_addr(struct amdgpu_device *adev, uint64_t addr) { -uint32_t df_inst_id; -uint64_t dram_base_addr =0 ; -const struct amdgpu_df_funcs *df_funcs = adev->df.funcs; - -if ((!df_funcs) || - (!df_funcs->get_df_inst_id) || - (!df_funcs->get_dram_base_addr)) { -dev_warn (adev->dev, -"XGMI: relative phy_addr algorithm is not supported\n" ); -return addr; - } - -if (amdgpu_dpm_set_df_cstate (adev,DF_CSTATE_DISALLOW )) { -dev_warn (adev->dev, -"failed to disable DF-Cstate, DF register may not be accessible\n" ); -return addr; - } - - df_inst_id = df_funcs->get_df_inst_id (adev); - dram_base_addr = df_funcs->get_dram_base_addr (adev, df_inst_id); - -if (amdgpu_dpm_set_df_cstate (adev,DF_CSTATE_ALLOW )) -dev_warn (adev->dev,"failed to enable DF-Cstate\n" ); - -return addr + dram_base_addr; +struct amdgpu_xgmi *xgmi = &adev->gmc.xgmi; +return (addr + xgmi->physical_node_id * xgmi->node_segment_size); } static void pcs_clear_status(struct amdgpu_device *adev, uint32_t pcs_status_reg) diff --git a/drivers/gpu/drm/amd/amdgpu/df_v3_6.c b/drivers/gpu/drm/amd/amdgpu/df_v3_6.c
index 5a1bd8e..a7b8292 100644
drivers/gpu/drm/amd/amdgpu/df_v3_6.c +0 -53
63 lines not on this page · raw message
--
2.7.4
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx