Merge branch 'drm-next-4.18' of git://people.freedesktop.org/~agd5f/linux into drm-next

Fixes for 4.18. Highlights:
- Fixes for gfxoff on Raven
- Remove an ATPX quirk now that the root cause is fixed
- Runtime PM fixes
- Vega20 register header update
- Wattman fixes
- Misc bug fixes

Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180614141428.2909-1-alexander.deucher@amd.com

1 files changed, 26 insertions, 1 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c b/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
index 0c768e388ace..727071fee6f6 100644
--- a/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
+++ b/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
@@ -47,6 +47,8 @@ MODULE_FIRMWARE("amdgpu/vega20_asd.bin");
 
 #define smnMP1_FIRMWARE_FLAGS 0x3010028
 
+static uint32_t sos_old_versions[] = {1517616, 1510592, 1448594, 1446554};
+
 static int
 psp_v3_1_get_fw_type(struct amdgpu_firmware_info *ucode, enum psp_gfx_fw_type *type)
 {
@@ -210,12 +212,31 @@ static int psp_v3_1_bootloader_load_sysdrv(struct psp_context *psp)
         return ret;
 }
 
+static bool psp_v3_1_match_version(struct amdgpu_device *adev, uint32_t ver)
+{
+        int i;
+
+        if (ver == adev->psp.sos_fw_version)
+                return true;
+
+        /*
+         * Double check if the latest four legacy versions.
+         * If yes, it is still the right version.
+         */
+        for (i = 0; i < sizeof(sos_old_versions) / sizeof(uint32_t); i++) {
+                if (sos_old_versions[i] == adev->psp.sos_fw_version)
+                        return true;
+        }
+
+        return false;
+}
+
 static int psp_v3_1_bootloader_load_sos(struct psp_context *psp)
 {
         int ret;
         unsigned int psp_gfxdrv_command_reg = 0;
         struct amdgpu_device *adev = psp->adev;
-        uint32_t sol_reg;
+        uint32_t sol_reg, ver;
 
         /* Check sOS sign of life register to confirm sys driver and sOS
          * are already been loaded.
@@ -248,6 +269,10 @@ static int psp_v3_1_bootloader_load_sos(struct psp_context *psp)
                            RREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_81),
                            0, true);
 
+        ver = RREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_58);
+        if (!psp_v3_1_match_version(adev, ver))
+                DRM_WARN("SOS version doesn't match\n");
+
         return ret;
 }