drm/amdgpu/psp: update the naming of GFX_FW_TYPE_RLC_RESTORE_LIST_CNTL
Subsystems (2)
PATCH 1/2 drm/amdgpu/psp: update the naming of GFX_FW_TYPE_RLC_RESTORE_LIST_CNTL
GFX_FW_TYPE_RLC_RESTORE_LIST_CNTL was reanmed to GFX_FW_TYPE_RLC_RESTORE_LIST_SRM_CNTL in latest psp_gfx_if drop
--- drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 2 +- drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h +1 -1
@@ -191,7 +191,7 @@ enum psp_gfx_fw_typeGFX_FW_TYPE_MMSCH =19 ,GFX_FW_TYPE_RLC_RESTORE_LIST_GPM_MEM =20 ,GFX_FW_TYPE_RLC_RESTORE_LIST_SRM_MEM =21 , -GFX_FW_TYPE_RLC_RESTORE_LIST_CNTL =22 , +GFX_FW_TYPE_RLC_RESTORE_LIST_SRM_CNTL =22 ,GFX_FW_TYPE_UVD1 =23 , GFX_FW_TYPE_MAX = 24 };
drivers/gpu/drm/amd/amdgpu/psp_v10_0.c +1 -1
@@ -73,7 +73,7 @@ psp_v10_0_get_fw_type(struct amdgpu_firmware_info *ucode, enum psp_gfx_fw_type * *type =GFX_FW_TYPE_RLC_G ;break ;case AMDGPU_UCODE_ID_RLC_RESTORE_LIST_CNTL : - *type =GFX_FW_TYPE_RLC_RESTORE_LIST_CNTL ; + *type =GFX_FW_TYPE_RLC_RESTORE_LIST_SRM_CNTL ;break ;case AMDGPU_UCODE_ID_RLC_RESTORE_LIST_GPM_MEM : *type =GFX_FW_TYPE_RLC_RESTORE_LIST_GPM_MEM ;
Signature · 6 lines
2.7.4 _______________________________________________ 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): 1546524044-8359-1-git-send-email-Hawking.Zhang-5C7GfCeVMHo@public.gmane.org
PATCH 2/2 drm/amdgpu/psp: make get_fw_type and prep_cmd_buf to be common interfaces
get_fw_type and prep_cmd_buf should be common interface instead of IP specific ones
--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 94 ++++++++++++++++++++++++++++++++- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 3 -- drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 90 ------------------------------- drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 75 -------------------------- drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 72 ------------------------- 5 files changed, 93 insertions(+), 241 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +93 -1
@@ -501,6 +501,98 @@ static int psp_hw_start(struct psp_context *psp)return 0 ; } +static int psp_get_fw_type (struct amdgpu_firmware_info *ucode, +enum psp_gfx_fw_type *type) +{ +switch (ucode->ucode_id) { +case AMDGPU_UCODE_ID_SDMA0 : + *type =GFX_FW_TYPE_SDMA0 ; +break ; +case AMDGPU_UCODE_ID_SDMA1 : + *type =GFX_FW_TYPE_SDMA1 ; +break ; +case AMDGPU_UCODE_ID_CP_CE : + *type =GFX_FW_TYPE_CP_CE ; +break ; +case AMDGPU_UCODE_ID_CP_PFP : + *type =GFX_FW_TYPE_CP_PFP ; +break ; +case AMDGPU_UCODE_ID_CP_ME : + *type =GFX_FW_TYPE_CP_ME ; +break ; +case AMDGPU_UCODE_ID_CP_MEC1 : + *type =GFX_FW_TYPE_CP_MEC ; +break ; +case AMDGPU_UCODE_ID_CP_MEC1_JT : + *type =GFX_FW_TYPE_CP_MEC_ME1 ; +break ; +case AMDGPU_UCODE_ID_CP_MEC2 : + *type =GFX_FW_TYPE_CP_MEC ; +break ; +case AMDGPU_UCODE_ID_CP_MEC2_JT : + *type =GFX_FW_TYPE_CP_MEC_ME2 ; +break ; +case AMDGPU_UCODE_ID_RLC_G : + *type =GFX_FW_TYPE_RLC_G ; +break ; +case AMDGPU_UCODE_ID_RLC_RESTORE_LIST_CNTL : + *type =GFX_FW_TYPE_RLC_RESTORE_LIST_SRM_CNTL ; +break ; +case AMDGPU_UCODE_ID_RLC_RESTORE_LIST_GPM_MEM : + *type =GFX_FW_TYPE_RLC_RESTORE_LIST_GPM_MEM ; +break ; +case AMDGPU_UCODE_ID_RLC_RESTORE_LIST_SRM_MEM : + *type =GFX_FW_TYPE_RLC_RESTORE_LIST_SRM_MEM ; +break ; +case AMDGPU_UCODE_ID_SMC : + *type =GFX_FW_TYPE_SMU ; +break ; +case AMDGPU_UCODE_ID_UVD : + *type =GFX_FW_TYPE_UVD ; +break ; +case AMDGPU_UCODE_ID_UVD1 : + *type =GFX_FW_TYPE_UVD1 ; +break ; +case AMDGPU_UCODE_ID_VCE : + *type =GFX_FW_TYPE_VCE ; +break ; +case AMDGPU_UCODE_ID_VCN : + *type =GFX_FW_TYPE_VCN ; +break ; +case AMDGPU_UCODE_ID_DMCU_ERAM : + *type =GFX_FW_TYPE_DMCU_ERAM ; +break ; +case AMDGPU_UCODE_ID_DMCU_INTV : + *type =GFX_FW_TYPE_DMCU_ISR ; +break ; +case AMDGPU_UCODE_ID_MAXIMUM : +default : +return -EINVAL ; + } + +return 0 ; +} + +static int psp_prep_load_ip_fw_cmd_buf (struct amdgpu_firmware_info *ucode, +struct psp_gfx_cmd_resp *cmd) +{ +int ret; +uint64_t fw_mem_mc_addr = ucode->mc_addr; + +memset (cmd,0 ,sizeof (struct psp_gfx_cmd_resp )); + + cmd->cmd_id =GFX_CMD_ID_LOAD_IP_FW ; + cmd->cmd.cmd_load_ip_fw.fw_phy_addr_lo =lower_32_bits (fw_mem_mc_addr); + cmd->cmd.cmd_load_ip_fw.fw_phy_addr_hi =upper_32_bits (fw_mem_mc_addr); + cmd->cmd.cmd_load_ip_fw.fw_size = ucode->ucode_size; + + ret =psp_get_fw_type (ucode, &cmd->cmd.cmd_load_ip_fw.fw_type); +if (ret) +DRM_ERROR ("Unknown firmware type\n" ); + +return ret; +} +static int psp_np_fw_load (struct psp_context *psp) {int i, ret;
@@ -522,7 +614,7 @@ static int psp_np_fw_load(struct psp_context *psp)/*skip ucode loading in SRIOV VF */ continue ; - ret =psp_prep_cmd_buf (ucode, psp->cmd); + ret =psp_prep_load_ip_fw_cmd_buf (ucode, psp->cmd);if (ret)return ret;
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h +0 -3
@@ -65,8 +65,6 @@ struct psp_funcsint (*init_microcode)(struct psp_context *psp);int (*bootloader_load_sysdrv)(struct psp_context *psp);int (*bootloader_load_sos)(struct psp_context *psp); -int (*prep_cmd_buf)(struct amdgpu_firmware_info *ucode, -struct psp_gfx_cmd_resp *cmd);int (*ring_init)(struct psp_context *psp,enum psp_ring_type ring_type);int (*ring_create)(struct psp_context *psp,enum psp_ring_type ring_type);
@@ -176,7 +174,6 @@ struct psp_xgmi_topology_info {struct psp_xgmi_node_info nodes[AMDGPU_XGMI_MAX_CONNECTED_NODES ]; }; -#define psp_prep_cmd_buf (ucode, type) (psp)->funcs->prep_cmd_buf((ucode), (type))#define psp_ring_init (psp, type) (psp)->funcs->ring_init((psp), (type))#define psp_ring_create (psp, type) (psp)->funcs->ring_create((psp), (type))#define psp_ring_stop (psp, type) (psp)->funcs->ring_stop((psp), (type))
drivers/gpu/drm/amd/amdgpu/psp_v10_0.c +0 -90
108 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/psp_v11_0.c +0 -75
93 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/psp_v3_1.c +0 -72
90 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
A message that is not in the archive (sent off-list or not yet received): 1546524044-8359-2-git-send-email-Hawking.Zhang-5C7GfCeVMHo@public.gmane.org
Deucher, Alexander
Reviewed-byRe: [PATCH 2/2] drm/amdgpu/psp: make get_fw_type and prep_cmd_buf to be common interfaces
Series is:
________________________________
From: amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org> on behalf of Hawking Zhang <[email protected]>
Sent: Thursday, January 3, 2019 9:00:44 AM
To: [email protected]
Cc: Zhang, Hawking
Subject: [PATCH 2/2] drm/amdgpu/psp: make get_fw_type and prep_cmd_buf to be common interfaces
get_fw_type and prep_cmd_buf should be common interface instead of IP specific ones
--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 94 ++++++++++++++++++++++++++++++++- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 3 -- drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 90 ------------------------------- drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 75 -------------------------- drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 72 ------------------------- 5 files changed, 93 insertions(+), 241 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +93 -1
@@ -501,6 +501,98 @@ static int psp_hw_start(struct psp_context *psp)return 0 ; } +static int psp_get_fw_type (struct amdgpu_firmware_info *ucode, +enum psp_gfx_fw_type *type) +{ +switch (ucode->ucode_id) { +case AMDGPU_UCODE_ID_SDMA0 : + *type =GFX_FW_TYPE_SDMA0 ; +break ; +case AMDGPU_UCODE_ID_SDMA1 : + *type =GFX_FW_TYPE_SDMA1 ; +break ; +case AMDGPU_UCODE_ID_CP_CE : + *type =GFX_FW_TYPE_CP_CE ; +break ; +case AMDGPU_UCODE_ID_CP_PFP : + *type =GFX_FW_TYPE_CP_PFP ; +break ; +case AMDGPU_UCODE_ID_CP_ME : + *type =GFX_FW_TYPE_CP_ME ; +break ; +case AMDGPU_UCODE_ID_CP_MEC1 : + *type =GFX_FW_TYPE_CP_MEC ; +break ; +case AMDGPU_UCODE_ID_CP_MEC1_JT : + *type =GFX_FW_TYPE_CP_MEC_ME1 ; +break ; +case AMDGPU_UCODE_ID_CP_MEC2 : + *type =GFX_FW_TYPE_CP_MEC ; +break ; +case AMDGPU_UCODE_ID_CP_MEC2_JT : + *type =GFX_FW_TYPE_CP_MEC_ME2 ; +break ; +case AMDGPU_UCODE_ID_RLC_G : + *type =GFX_FW_TYPE_RLC_G ; +break ; +case AMDGPU_UCODE_ID_RLC_RESTORE_LIST_CNTL : + *type =GFX_FW_TYPE_RLC_RESTORE_LIST_SRM_CNTL ; +break ; +case AMDGPU_UCODE_ID_RLC_RESTORE_LIST_GPM_MEM : + *type =GFX_FW_TYPE_RLC_RESTORE_LIST_GPM_MEM ; +break ; +case AMDGPU_UCODE_ID_RLC_RESTORE_LIST_SRM_MEM : + *type =GFX_FW_TYPE_RLC_RESTORE_LIST_SRM_MEM ; +break ; +case AMDGPU_UCODE_ID_SMC : + *type =GFX_FW_TYPE_SMU ; +break ; +case AMDGPU_UCODE_ID_UVD : + *type =GFX_FW_TYPE_UVD ; +break ; +case AMDGPU_UCODE_ID_UVD1 : + *type =GFX_FW_TYPE_UVD1 ; +break ; +case AMDGPU_UCODE_ID_VCE : + *type =GFX_FW_TYPE_VCE ; +break ; +case AMDGPU_UCODE_ID_VCN : + *type =GFX_FW_TYPE_VCN ; +break ; +case AMDGPU_UCODE_ID_DMCU_ERAM : + *type =GFX_FW_TYPE_DMCU_ERAM ; +break ; +case AMDGPU_UCODE_ID_DMCU_INTV : + *type =GFX_FW_TYPE_DMCU_ISR ; +break ; +case AMDGPU_UCODE_ID_MAXIMUM : +default : +return -EINVAL ; + } + +return 0 ; +} + +static int psp_prep_load_ip_fw_cmd_buf (struct amdgpu_firmware_info *ucode, +struct psp_gfx_cmd_resp *cmd) +{ +int ret; +uint64_t fw_mem_mc_addr = ucode->mc_addr; + +memset (cmd,0 ,sizeof (struct psp_gfx_cmd_resp )); + + cmd->cmd_id =GFX_CMD_ID_LOAD_IP_FW ; + cmd->cmd.cmd_load_ip_fw.fw_phy_addr_lo =lower_32_bits (fw_mem_mc_addr); + cmd->cmd.cmd_load_ip_fw.fw_phy_addr_hi =upper_32_bits (fw_mem_mc_addr); + cmd->cmd.cmd_load_ip_fw.fw_size = ucode->ucode_size; + + ret =psp_get_fw_type (ucode, &cmd->cmd.cmd_load_ip_fw.fw_type); +if (ret) +DRM_ERROR ("Unknown firmware type\n" ); + +return ret; +} +static int psp_np_fw_load (struct psp_context *psp) {int i, ret;
@@ -522,7 +614,7 @@ static int psp_np_fw_load(struct psp_context *psp)/*skip ucode loading in SRIOV VF */ continue ; - ret =psp_prep_cmd_buf (ucode, psp->cmd); + ret =psp_prep_load_ip_fw_cmd_buf (ucode, psp->cmd);if (ret)return ret;
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h +0 -3
@@ -65,8 +65,6 @@ struct psp_funcsint (*init_microcode)(struct psp_context *psp);int (*bootloader_load_sysdrv)(struct psp_context *psp);int (*bootloader_load_sos)(struct psp_context *psp); -int (*prep_cmd_buf)(struct amdgpu_firmware_info *ucode, -struct psp_gfx_cmd_resp *cmd);int (*ring_init)(struct psp_context *psp,enum psp_ring_type ring_type);int (*ring_create)(struct psp_context *psp,enum psp_ring_type ring_type);
@@ -176,7 +174,6 @@ struct psp_xgmi_topology_info {struct psp_xgmi_node_info nodes[AMDGPU_XGMI_MAX_CONNECTED_NODES ]; }; -#define psp_prep_cmd_buf (ucode, type) (psp)->funcs->prep_cmd_buf((ucode), (type))#define psp_ring_init (psp, type) (psp)->funcs->ring_init((psp), (type))#define psp_ring_create (psp, type) (psp)->funcs->ring_create((psp), (type))#define psp_ring_stop (psp, type) (psp)->funcs->ring_stop((psp), (type))
drivers/gpu/drm/amd/amdgpu/psp_v10_0.c +0 -90
108 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/psp_v11_0.c +0 -75
93 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/psp_v3_1.c +0 -72
90 lines not on this page · raw message
--
2.7.4
_______________________________________________
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