[PATCH 2/5] drm/amdgpu: Change a few function names

[Deucher, Alexander]

[Public]

Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

________________________________
From: amd-gfx <amd-gfx-bounces at lists.freedesktop.org> on behalf of Oak Zeng <Oak.Zeng at amd.com>
Sent: Thursday, July 15, 2021 9:25 PM
To: amd-gfx at lists.freedesktop.org <amd-gfx at lists.freedesktop.org>
Cc: Xu, Feifei <Feifei.Xu at amd.com>; Kuehling, Felix <Felix.Kuehling at amd.com>; Liu, Leo <Leo.Liu at amd.com>; Zeng, Oak <Oak.Zeng at amd.com>; Zhang, Hawking <Hawking.Zhang at amd.com>
Subject: [PATCH 2/5] 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: Oak Zeng <Oak.Zeng at amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
index d9ddb2c..8d1e2b2 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -2351,7 +2351,7 @@ static int psp_prep_load_ip_fw_cmd_buf(struct amdgpu_firmware_info *ucode,
         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)
 {
         int ret = 0;
@@ -2387,7 +2387,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)
                 DRM_ERROR("PSP load smu failed!\n");
@@ -2442,14 +2442,14 @@ int psp_load_fw_list(struct psp_context *psp,
         for (i = 0; i < ucode_count; ++i) {
                 ucode = ucode_list[i];
                 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)
                         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;
         struct amdgpu_firmware_info *ucode;
@@ -2488,7 +2488,7 @@ static int psp_np_fw_load(struct psp_context *psp)

                 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)
                         return ret;

@@ -2565,7 +2565,7 @@ static int psp_load_fw(struct amdgpu_device *adev)
         if (ret)
                 goto failed;

-       ret = psp_np_fw_load(psp);
+       ret = psp_load_non_psp_fw(psp);
         if (ret)
                 goto failed;

@@ -2765,7 +2765,7 @@ static int psp_resume(void *handle)
         if (ret)
                 goto failed;

-       ret = psp_np_fw_load(psp);
+       ret = psp_load_non_psp_fw(psp);
         if (ret)
                 goto failed;

@@ -2863,7 +2863,7 @@ int psp_update_vcn_sram(struct amdgpu_device *adev, int inst_idx,
         ucode.mc_addr = cmd_gpu_addr;
         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,
--
2.7.4

_______________________________________________
amd-gfx mailing list
amd-gfx at lists.freedesktop.org
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7Calexander.deucher%40amd.com%7C27434c9fa61e4b45a66b08d947f899a5%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637619955325142021%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=Glg8agdk%2BQu5ToJqr7RaF9br4TUfbW%2BFZo1nMX1liZ8%3D&reserved=0
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/amd-gfx/attachments/20210716/e92a153a/attachment-0001.htm>