OSDN Git Service

drm/amdgpu: drop the non-sense firmware version check on arcturus
authorEvan Quan <evan.quan@amd.com>
Mon, 17 Feb 2020 10:20:24 +0000 (18:20 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 19 Feb 2020 15:36:26 +0000 (10:36 -0500)
As the firmware versions of arcturus are different from other gfx9
ASICs. And the warning("CP firmware version too old, please update!")
caused by this check can be eliminated.

Signed-off-by: Evan Quan <evan.quan@amd.com>
Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c

index 3afdbbd..6a49fe4 100644 (file)
@@ -1106,10 +1106,11 @@ static void gfx_v9_0_check_fw_write_wait(struct amdgpu_device *adev)
        adev->gfx.me_fw_write_wait = false;
        adev->gfx.mec_fw_write_wait = false;
 
-       if ((adev->gfx.mec_fw_version < 0x000001a5) ||
+       if ((adev->asic_type != CHIP_ARCTURUS) &&
+           ((adev->gfx.mec_fw_version < 0x000001a5) ||
            (adev->gfx.mec_feature_version < 46) ||
            (adev->gfx.pfp_fw_version < 0x000000b7) ||
-           (adev->gfx.pfp_feature_version < 46))
+           (adev->gfx.pfp_feature_version < 46)))
                DRM_WARN_ONCE("CP firmware version too old, please update!");
 
        switch (adev->asic_type) {