Looks good to me.
The patch set is Reviewed-by: Veerabadhran Gopalakrishnan
<Veerabadhran.Gopalakrishnan@xxxxxxx>
Regards,
Veera
On 6/27/2023 10:18 AM, Lang Yu wrote:
This function is more general and easy to use by more clients.
Signed-off-by: Lang Yu <Lang.Yu@xxxxxxx>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 29 +++++++++++++++++++++++++
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 6 +++++
2 files changed, 35 insertions(+)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
index a33c155dddcf..a1cb541f315f 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -2445,6 +2445,35 @@ static int psp_prep_load_ip_fw_cmd_buf(struct amdgpu_firmware_info *ucode,
return ret;
}
+int psp_execute_load_ip_fw_cmd_buf(struct amdgpu_device *adev,
+ struct amdgpu_firmware_info *ucode,
+ uint32_t ucode_id,
+ uint64_t cmd_buf_gpu_addr,
+ int cmd_buf_size)
+{
+ struct amdgpu_firmware_info fw_info = {
+ .ucode_id = ucode_id,
+ .mc_addr = cmd_buf_gpu_addr,
+ .ucode_size = cmd_buf_size,
+ };
+ struct psp_context *psp = &adev->psp;
+ struct psp_gfx_cmd_resp *cmd =
+ acquire_psp_cmd_buf(psp);
+ int ret;
+
+ if (!ucode)
+ ucode = &fw_info;
+
+ ret = psp_prep_load_ip_fw_cmd_buf(ucode, cmd);
+ if (!ret)
+ ret = psp_cmd_submit_buf(psp, ucode, cmd,
+ psp->fence_buf_mc_addr);
+
+ release_psp_cmd_buf(psp);
+
+ return ret;
+}
+
static int psp_execute_non_psp_fw_load(struct psp_context *psp,
struct amdgpu_firmware_info *ucode)
{
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
index 4847aacdf9dc..bd324fed6237 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
@@ -462,6 +462,12 @@ int psp_gpu_reset(struct amdgpu_device *adev);
int psp_update_vcn_sram(struct amdgpu_device *adev, int inst_idx,
uint64_t cmd_gpu_addr, int cmd_size);
+int psp_execute_load_ip_fw_cmd_buf(struct amdgpu_device *adev,
+ struct amdgpu_firmware_info *ucode,
+ uint32_t ucode_id,
+ uint64_t cmd_buf_gpu_addr,
+ int cmd_buf_size);
+
int psp_ta_init_shared_buf(struct psp_context *psp,
struct ta_mem_context *mem_ctx);
void psp_ta_free_shared_buf(struct ta_mem_context *mem_ctx);
