Commit cd5955f4 authored by Oak Zeng's avatar Oak Zeng Committed by Alex Deucher

drm/amdgpu: Change a few function names

Function name "psp_np_fw_load" is not proper as people don't
know _np_fw_ means "non psp firmware". Change the function
name to psp_load_non_psp_fw for better understanding. Same
thing for function psp_execute_np_fw_load.
Signed-off-by: default avatarOak Zeng <Oak.Zeng@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarChristian Konig <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 95f71f12
...@@ -2373,7 +2373,7 @@ static int psp_prep_load_ip_fw_cmd_buf(struct amdgpu_firmware_info *ucode, ...@@ -2373,7 +2373,7 @@ static int psp_prep_load_ip_fw_cmd_buf(struct amdgpu_firmware_info *ucode,
return ret; return ret;
} }
static int psp_execute_np_fw_load(struct psp_context *psp, static int psp_execute_non_psp_fw_load(struct psp_context *psp,
struct amdgpu_firmware_info *ucode) struct amdgpu_firmware_info *ucode)
{ {
int ret = 0; int ret = 0;
...@@ -2409,7 +2409,7 @@ static int psp_load_smu_fw(struct psp_context *psp) ...@@ -2409,7 +2409,7 @@ static int psp_load_smu_fw(struct psp_context *psp)
} }
} }
ret = psp_execute_np_fw_load(psp, ucode); ret = psp_execute_non_psp_fw_load(psp, ucode);
if (ret) if (ret)
DRM_ERROR("PSP load smu failed!\n"); DRM_ERROR("PSP load smu failed!\n");
...@@ -2464,14 +2464,14 @@ int psp_load_fw_list(struct psp_context *psp, ...@@ -2464,14 +2464,14 @@ int psp_load_fw_list(struct psp_context *psp,
for (i = 0; i < ucode_count; ++i) { for (i = 0; i < ucode_count; ++i) {
ucode = ucode_list[i]; ucode = ucode_list[i];
psp_print_fw_hdr(psp, ucode); psp_print_fw_hdr(psp, ucode);
ret = psp_execute_np_fw_load(psp, ucode); ret = psp_execute_non_psp_fw_load(psp, ucode);
if (ret) if (ret)
return ret; return ret;
} }
return ret; return ret;
} }
static int psp_np_fw_load(struct psp_context *psp) static int psp_load_non_psp_fw(struct psp_context *psp)
{ {
int i, ret; int i, ret;
struct amdgpu_firmware_info *ucode; struct amdgpu_firmware_info *ucode;
...@@ -2510,7 +2510,7 @@ static int psp_np_fw_load(struct psp_context *psp) ...@@ -2510,7 +2510,7 @@ static int psp_np_fw_load(struct psp_context *psp)
psp_print_fw_hdr(psp, ucode); psp_print_fw_hdr(psp, ucode);
ret = psp_execute_np_fw_load(psp, ucode); ret = psp_execute_non_psp_fw_load(psp, ucode);
if (ret) if (ret)
return ret; return ret;
...@@ -2587,7 +2587,7 @@ static int psp_load_fw(struct amdgpu_device *adev) ...@@ -2587,7 +2587,7 @@ static int psp_load_fw(struct amdgpu_device *adev)
if (ret) if (ret)
goto failed; goto failed;
ret = psp_np_fw_load(psp); ret = psp_load_non_psp_fw(psp);
if (ret) if (ret)
goto failed; goto failed;
...@@ -2787,7 +2787,7 @@ static int psp_resume(void *handle) ...@@ -2787,7 +2787,7 @@ static int psp_resume(void *handle)
if (ret) if (ret)
goto failed; goto failed;
ret = psp_np_fw_load(psp); ret = psp_load_non_psp_fw(psp);
if (ret) if (ret)
goto failed; goto failed;
...@@ -2885,7 +2885,7 @@ int psp_update_vcn_sram(struct amdgpu_device *adev, int inst_idx, ...@@ -2885,7 +2885,7 @@ int psp_update_vcn_sram(struct amdgpu_device *adev, int inst_idx,
ucode.mc_addr = cmd_gpu_addr; ucode.mc_addr = cmd_gpu_addr;
ucode.ucode_size = cmd_size; ucode.ucode_size = cmd_size;
return psp_execute_np_fw_load(&adev->psp, &ucode); return psp_execute_non_psp_fw_load(&adev->psp, &ucode);
} }
int psp_ring_cmd_submit(struct psp_context *psp, int psp_ring_cmd_submit(struct psp_context *psp,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment