Merge tag 'kvm-s390-master-4.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_ucode.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
index 36c763310df5f6402fc3d28be2f2ab5b85245f9f..65649026b836c0e1554e0859314b725bbf2d0032 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
@@ -270,12 +270,8 @@ amdgpu_ucode_get_load_type(struct amdgpu_device *adev, int load_type)
                else
                        return AMDGPU_FW_LOAD_SMU;
        case CHIP_VEGA10:
-               if (!load_type)
-                       return AMDGPU_FW_LOAD_DIRECT;
-               else
-                       return AMDGPU_FW_LOAD_PSP;
        case CHIP_RAVEN:
-               if (load_type != 2)
+               if (!load_type)
                        return AMDGPU_FW_LOAD_DIRECT;
                else
                        return AMDGPU_FW_LOAD_PSP;
@@ -364,8 +360,6 @@ static int amdgpu_ucode_patch_jt(struct amdgpu_firmware_info *ucode,
 int amdgpu_ucode_init_bo(struct amdgpu_device *adev)
 {
        struct amdgpu_bo **bo = &adev->firmware.fw_buf;
-       uint64_t fw_mc_addr;
-       void *fw_buf_ptr = NULL;
        uint64_t fw_offset = 0;
        int i, err;
        struct amdgpu_firmware_info *ucode = NULL;
@@ -376,37 +370,39 @@ int amdgpu_ucode_init_bo(struct amdgpu_device *adev)
                return 0;
        }
 
-       err = amdgpu_bo_create(adev, adev->firmware.fw_size, PAGE_SIZE, true,
-                               amdgpu_sriov_vf(adev) ? AMDGPU_GEM_DOMAIN_VRAM : AMDGPU_GEM_DOMAIN_GTT,
-                               AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS,
-                               NULL, NULL, 0, bo);
-       if (err) {
-               dev_err(adev->dev, "(%d) Firmware buffer allocate failed\n", err);
-               goto failed;
-       }
+       if (!amdgpu_sriov_vf(adev) || !adev->in_sriov_reset) {
+               err = amdgpu_bo_create(adev, adev->firmware.fw_size, PAGE_SIZE, true,
+                                       amdgpu_sriov_vf(adev) ? AMDGPU_GEM_DOMAIN_VRAM : AMDGPU_GEM_DOMAIN_GTT,
+                                       AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS,
+                                       NULL, NULL, 0, bo);
+               if (err) {
+                       dev_err(adev->dev, "(%d) Firmware buffer allocate failed\n", err);
+                       goto failed;
+               }
 
-       err = amdgpu_bo_reserve(*bo, false);
-       if (err) {
-               dev_err(adev->dev, "(%d) Firmware buffer reserve failed\n", err);
-               goto failed_reserve;
-       }
+               err = amdgpu_bo_reserve(*bo, false);
+               if (err) {
+                       dev_err(adev->dev, "(%d) Firmware buffer reserve failed\n", err);
+                       goto failed_reserve;
+               }
 
-       err = amdgpu_bo_pin(*bo, amdgpu_sriov_vf(adev) ? AMDGPU_GEM_DOMAIN_VRAM : AMDGPU_GEM_DOMAIN_GTT,
-                               &fw_mc_addr);
-       if (err) {
-               dev_err(adev->dev, "(%d) Firmware buffer pin failed\n", err);
-               goto failed_pin;
-       }
+               err = amdgpu_bo_pin(*bo, amdgpu_sriov_vf(adev) ? AMDGPU_GEM_DOMAIN_VRAM : AMDGPU_GEM_DOMAIN_GTT,
+                                       &adev->firmware.fw_buf_mc);
+               if (err) {
+                       dev_err(adev->dev, "(%d) Firmware buffer pin failed\n", err);
+                       goto failed_pin;
+               }
 
-       err = amdgpu_bo_kmap(*bo, &fw_buf_ptr);
-       if (err) {
-               dev_err(adev->dev, "(%d) Firmware buffer kmap failed\n", err);
-               goto failed_kmap;
-       }
+               err = amdgpu_bo_kmap(*bo, &adev->firmware.fw_buf_ptr);
+               if (err) {
+                       dev_err(adev->dev, "(%d) Firmware buffer kmap failed\n", err);
+                       goto failed_kmap;
+               }
 
-       amdgpu_bo_unreserve(*bo);
+               amdgpu_bo_unreserve(*bo);
+       }
 
-       memset(fw_buf_ptr, 0, adev->firmware.fw_size);
+       memset(adev->firmware.fw_buf_ptr, 0, adev->firmware.fw_size);
 
        /*
         * if SMU loaded firmware, it needn't add SMC, UVD, and VCE
@@ -425,14 +421,14 @@ int amdgpu_ucode_init_bo(struct amdgpu_device *adev)
                ucode = &adev->firmware.ucode[i];
                if (ucode->fw) {
                        header = (const struct common_firmware_header *)ucode->fw->data;
-                       amdgpu_ucode_init_single_fw(adev, ucode, fw_mc_addr + fw_offset,
-                                                   (void *)((uint8_t *)fw_buf_ptr + fw_offset));
+                       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 &&
                            adev->firmware.load_type != AMDGPU_FW_LOAD_PSP) {
                                const struct gfx_firmware_header_v1_0 *cp_hdr;
                                cp_hdr = (const struct gfx_firmware_header_v1_0 *)ucode->fw->data;
-                               amdgpu_ucode_patch_jt(ucode, fw_mc_addr + fw_offset,
-                                                   fw_buf_ptr + fw_offset);
+                               amdgpu_ucode_patch_jt(ucode,  adev->firmware.fw_buf_mc + fw_offset,
+                                                   adev->firmware.fw_buf_ptr + fw_offset);
                                fw_offset += ALIGN(le32_to_cpu(cp_hdr->jt_size) << 2, PAGE_SIZE);
                        }
                        fw_offset += ALIGN(ucode->ucode_size, PAGE_SIZE);