diff options
| author | Evan Quan | 2019-07-16 08:20:22 +0200 |
|---|---|---|
| committer | Alex Deucher | 2019-07-17 20:34:30 +0200 |
| commit | 93002849ffc7d1f12db60a37c30610d02844363b (patch) | |
| tree | 257f613af2a485031947a05f9e7117820065baff /drivers/gpu/drm/amd/powerplay/smu_v11_0.c | |
| parent | drm/amd/powerplay: correct smu_update_table usage (diff) | |
| download | kernel-qcow2-linux-93002849ffc7d1f12db60a37c30610d02844363b.tar.gz kernel-qcow2-linux-93002849ffc7d1f12db60a37c30610d02844363b.tar.xz kernel-qcow2-linux-93002849ffc7d1f12db60a37c30610d02844363b.zip | |
drm/amd/powerplay: maintain SMU FW backward compatibility
Do not halt driver loading on if_version mismatch. As our
driver and FWs are backward compatible.
Signed-off-by: Evan Quan <evan.quan@amd.com>
Reviewed-by: Kenneth Feng <kenneth.feng@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/powerplay/smu_v11_0.c')
| -rw-r--r-- | drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c index f182d75e127d..95c7c4dae523 100644 --- a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c +++ b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c @@ -261,14 +261,20 @@ static int smu_v11_0_check_fw_version(struct smu_context *smu) smu_minor = (smu_version >> 8) & 0xff; smu_debug = (smu_version >> 0) & 0xff; - + /* + * 1. if_version mismatch is not critical as our fw is designed + * to be backward compatible. + * 2. New fw usually brings some optimizations. But that's visible + * only on the paired driver. + * Considering above, we just leave user a warning message instead + * of halt driver loading. + */ if (if_version != smu->smc_if_version) { pr_info("smu driver if version = 0x%08x, smu fw if version = 0x%08x, " "smu fw version = 0x%08x (%d.%d.%d)\n", smu->smc_if_version, if_version, smu_version, smu_major, smu_minor, smu_debug); - pr_err("SMU driver if version not matched\n"); - ret = -EINVAL; + pr_warn("SMU driver if version not matched\n"); } return ret; |