1 files changed, 287 insertions, 271 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 39bf2ce548c6..1e4dd09a5072 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -62,6 +62,8 @@
 MODULE_FIRMWARE("amdgpu/vega10_gpu_info.bin");
 MODULE_FIRMWARE("amdgpu/vega12_gpu_info.bin");
 MODULE_FIRMWARE("amdgpu/raven_gpu_info.bin");
+MODULE_FIRMWARE("amdgpu/picasso_gpu_info.bin");
+MODULE_FIRMWARE("amdgpu/raven2_gpu_info.bin");
 
 #define AMDGPU_RESUME_MS                2000
 
@@ -652,71 +654,6 @@ void amdgpu_device_wb_free(struct amdgpu_device *adev, u32 wb)
 }
 
 /**
- * amdgpu_device_vram_location - try to find VRAM location
- *
- * @adev: amdgpu device structure holding all necessary informations
- * @mc: memory controller structure holding memory informations
- * @base: base address at which to put VRAM
- *
- * Function will try to place VRAM at base address provided
- * as parameter.
- */
-void amdgpu_device_vram_location(struct amdgpu_device *adev,
-                                 struct amdgpu_gmc *mc, u64 base)
-{
-        uint64_t limit = (uint64_t)amdgpu_vram_limit << 20;
-
-        mc->vram_start = base;
-        mc->vram_end = mc->vram_start + mc->mc_vram_size - 1;
-        if (limit && limit < mc->real_vram_size)
-                mc->real_vram_size = limit;
-        dev_info(adev->dev, "VRAM: %lluM 0x%016llX - 0x%016llX (%lluM used)\n",
-                        mc->mc_vram_size >> 20, mc->vram_start,
-                        mc->vram_end, mc->real_vram_size >> 20);
-}
-
-/**
- * amdgpu_device_gart_location - try to find GART location
- *
- * @adev: amdgpu device structure holding all necessary informations
- * @mc: memory controller structure holding memory informations
- *
- * Function will place try to place GART before or after VRAM.
- *
- * If GART size is bigger than space left then we ajust GART size.
- * Thus function will never fails.
- */
-void amdgpu_device_gart_location(struct amdgpu_device *adev,
-                                 struct amdgpu_gmc *mc)
-{
-        u64 size_af, size_bf;
-
-        mc->gart_size += adev->pm.smu_prv_buffer_size;
-
-        size_af = adev->gmc.mc_mask - mc->vram_end;
-        size_bf = mc->vram_start;
-        if (size_bf > size_af) {
-                if (mc->gart_size > size_bf) {
-                        dev_warn(adev->dev, "limiting GART\n");
-                        mc->gart_size = size_bf;
-                }
-                mc->gart_start = 0;
-        } else {
-                if (mc->gart_size > size_af) {
-                        dev_warn(adev->dev, "limiting GART\n");
-                        mc->gart_size = size_af;
-                }
-                /* VCE doesn't like it when BOs cross a 4GB segment, so align
-                 * the GART base on a 4GB boundary as well.
-                 */
-                mc->gart_start = ALIGN(mc->vram_end + 1, 0x100000000ULL);
-        }
-        mc->gart_end = mc->gart_start + mc->gart_size - 1;
-        dev_info(adev->dev, "GART: %lluM 0x%016llX - 0x%016llX\n",
-                        mc->gart_size >> 20, mc->gart_start, mc->gart_end);
-}
-
-/**
  * amdgpu_device_resize_fb_bar - try to resize FB BAR
  *
  * @adev: amdgpu_device pointer
@@ -1397,7 +1334,12 @@ static int amdgpu_device_parse_gpu_info_fw(struct amdgpu_device *adev)
                 chip_name = "vega12";
                 break;
         case CHIP_RAVEN:
-                chip_name = "raven";
+                if (adev->rev_id >= 8)
+                        chip_name = "raven2";
+                else if (adev->pdev->device == 0x15d8)
+                        chip_name = "picasso";
+                else
+                        chip_name = "raven";
                 break;
         }
 
@@ -1551,6 +1493,8 @@ static int amdgpu_device_ip_early_init(struct amdgpu_device *adev)
         }
 
         adev->powerplay.pp_feature = amdgpu_pp_feature_mask;
+        if (amdgpu_sriov_vf(adev))
+                adev->powerplay.pp_feature &= ~PP_GFXOFF_MASK;
 
         for (i = 0; i < adev->num_ip_blocks; i++) {
                 if ((amdgpu_ip_block_mask & (1 << i)) == 0) {
@@ -1581,6 +1525,92 @@ static int amdgpu_device_ip_early_init(struct amdgpu_device *adev)
         return 0;
 }
 
+static int amdgpu_device_ip_hw_init_phase1(struct amdgpu_device *adev)
+{
+        int i, r;
+
+        for (i = 0; i < adev->num_ip_blocks; i++) {
+                if (!adev->ip_blocks[i].status.sw)
+                        continue;
+                if (adev->ip_blocks[i].status.hw)
+                        continue;
+                if (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_COMMON ||
+                    adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_IH) {
+                        r = adev->ip_blocks[i].version->funcs->hw_init(adev);
+                        if (r) {
+                                DRM_ERROR("hw_init of IP block <%s> failed %d\n",
+                                          adev->ip_blocks[i].version->funcs->name, r);
+                                return r;
+                        }
+                        adev->ip_blocks[i].status.hw = true;
+                }
+        }
+
+        return 0;
+}
+
+static int amdgpu_device_ip_hw_init_phase2(struct amdgpu_device *adev)
+{
+        int i, r;
+
+        for (i = 0; i < adev->num_ip_blocks; i++) {
+                if (!adev->ip_blocks[i].status.sw)
+                        continue;
+                if (adev->ip_blocks[i].status.hw)
+                        continue;
+                r = adev->ip_blocks[i].version->funcs->hw_init(adev);
+                if (r) {
+                        DRM_ERROR("hw_init of IP block <%s> failed %d\n",
+                                  adev->ip_blocks[i].version->funcs->name, r);
+                        return r;
+                }
+                adev->ip_blocks[i].status.hw = true;
+        }
+
+        return 0;
+}
+
+static int amdgpu_device_fw_loading(struct amdgpu_device *adev)
+{
+        int r = 0;
+        int i;
+
+        if (adev->asic_type >= CHIP_VEGA10) {
+                for (i = 0; i < adev->num_ip_blocks; i++) {
+                        if (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_PSP) {
+                                if (adev->in_gpu_reset || adev->in_suspend) {
+                                        if (amdgpu_sriov_vf(adev) && adev->in_gpu_reset)
+                                                break; /* sriov gpu reset, psp need to do hw_init before IH because of hw limit */
+                                        r = adev->ip_blocks[i].version->funcs->resume(adev);
+                                        if (r) {
+                                                DRM_ERROR("resume of IP block <%s> failed %d\n",
+                                                          adev->ip_blocks[i].version->funcs->name, r);
+                                                return r;
+                                        }
+                                } else {
+                                        r = adev->ip_blocks[i].version->funcs->hw_init(adev);
+                                        if (r) {
+                                                DRM_ERROR("hw_init of IP block <%s> failed %d\n",
+                                                  adev->ip_blocks[i].version->funcs->name, r);
+                                                return r;
+                                        }
+                                }
+                                adev->ip_blocks[i].status.hw = true;
+                        }
+                }
+        }
+