1 files changed, 30 insertions, 54 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
index 1fa8bc337859..7b33867036e7 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
@@ -297,10 +297,7 @@ amdgpu_ucode_get_load_type(struct amdgpu_device *adev, int load_type)
         case CHIP_POLARIS11:
         case CHIP_POLARIS12:
         case CHIP_VEGAM:
-                if (!load_type)
-                        return AMDGPU_FW_LOAD_DIRECT;
-                else
-                        return AMDGPU_FW_LOAD_SMU;
+                return AMDGPU_FW_LOAD_SMU;
         case CHIP_VEGA10:
         case CHIP_RAVEN:
         case CHIP_VEGA12:
@@ -423,32 +420,41 @@ static int amdgpu_ucode_patch_jt(struct amdgpu_firmware_info *ucode,
         return 0;
 }
 
-int amdgpu_ucode_init_bo(struct amdgpu_device *adev)
+int amdgpu_ucode_create_bo(struct amdgpu_device *adev)
 {
-        uint64_t fw_offset = 0;
-        int i, err;
-        struct amdgpu_firmware_info *ucode = NULL;
-        const struct common_firmware_header *header = NULL;
-
-        if (!adev->firmware.fw_size) {
-                dev_warn(adev->dev, "No ip firmware need to load\n");
-                return 0;
-        }
-
-        if (!adev->in_gpu_reset) {
-                err = amdgpu_bo_create_kernel(adev, adev->firmware.fw_size, PAGE_SIZE,
-                                        amdgpu_sriov_vf(adev) ? AMDGPU_GEM_DOMAIN_VRAM : AMDGPU_GEM_DOMAIN_GTT,
-                                        &adev->firmware.fw_buf,
-                                        &adev->firmware.fw_buf_mc,
-                                        &adev->firmware.fw_buf_ptr);
-                if (err) {
+        if (adev->firmware.load_type != AMDGPU_FW_LOAD_DIRECT) {
+                amdgpu_bo_create_kernel(adev, adev->firmware.fw_size, PAGE_SIZE,
+                        amdgpu_sriov_vf(adev) ? AMDGPU_GEM_DOMAIN_VRAM : AMDGPU_GEM_DOMAIN_GTT,
+                        &adev->firmware.fw_buf,
+                        &adev->firmware.fw_buf_mc,
+                        &adev->firmware.fw_buf_ptr);
+                if (!adev->firmware.fw_buf) {
                         dev_err(adev->dev, "failed to create kernel buffer for firmware.fw_buf\n");
-                        goto failed;
+                        return -ENOMEM;
+                } else if (amdgpu_sriov_vf(adev)) {
+                        memset(adev->firmware.fw_buf_ptr, 0, adev->firmware.fw_size);
                 }
         }
+        return 0;
+}
+
+void amdgpu_ucode_free_bo(struct amdgpu_device *adev)
+{
+        if (adev->firmware.load_type != AMDGPU_FW_LOAD_DIRECT)
+                amdgpu_bo_free_kernel(&adev->firmware.fw_buf,
+                &adev->firmware.fw_buf_mc,
+                &adev->firmware.fw_buf_ptr);
+}
 
-        memset(adev->firmware.fw_buf_ptr, 0, adev->firmware.fw_size);
+int amdgpu_ucode_init_bo(struct amdgpu_device *adev)
+{
+        uint64_t fw_offset = 0;
+        int i;
+        struct amdgpu_firmware_info *ucode = NULL;
 
+ /* for baremetal, the ucode is allocated in gtt, so don't need to fill the bo when reset/suspend */
+        if (!amdgpu_sriov_vf(adev) && (adev->in_gpu_reset || adev->in_suspend))
+                return 0;
         /*
          * if SMU loaded firmware, it needn't add SMC, UVD, and VCE
          * ucode info here
@@ -465,7 +471,6 @@ int amdgpu_ucode_init_bo(struct amdgpu_device *adev)
         for (i = 0; i < adev->firmware.max_ucodes; i++) {
                 ucode = &adev->firmware.ucode[i];
                 if (ucode->fw) {
-                        header = (const struct common_firmware_header *)ucode->fw->data;
                         amdgpu_ucode_init_single_fw(adev, ucode, adev->firmware.fw_buf_mc + fw_offset,
                                                     adev->firmware.fw_buf_ptr + fw_offset);
                         if (i == AMDGPU_UCODE_ID_CP_MEC1 &&
@@ -480,33 +485,4 @@ int amdgpu_ucode_init_bo(struct amdgpu_device *adev)
                 }
         }
         return 0;
-
-failed:
-        if (err)
-                adev->firmware.load_type = AMDGPU_FW_LOAD_DIRECT;
-
-        return err;
-}
-
-int amdgpu_ucode_fini_bo(struct amdgpu_device *adev)
-{
-        int i;
-        struct amdgpu_firmware_info *ucode = NULL;
-
-        if (!adev->firmware.fw_size)
-                return 0;
-
-        for (i = 0; i < adev->firmware.max_ucodes; i++) {
-                ucode = &adev->firmware.ucode[i];
-                if (ucode->fw) {
-                        ucode->mc_addr = 0;
-                        ucode->kaddr = NULL;
-                }
-        }
-
-        amdgpu_bo_free_kernel(&adev->firmware.fw_buf,
-                                &adev->firmware.fw_buf_mc,
-                                &adev->firmware.fw_buf_ptr);
-
-        return 0;
 }