|
@@ -1410,8 +1410,6 @@ static int vi_common_early_init(void *handle)
|
|
adev->cg_flags = 0;
|
|
adev->cg_flags = 0;
|
|
adev->pg_flags = 0;
|
|
adev->pg_flags = 0;
|
|
adev->external_rev_id = 0x1;
|
|
adev->external_rev_id = 0x1;
|
|
- if (amdgpu_smc_load_fw && smc_enabled)
|
|
|
|
- adev->firmware.smu_load = true;
|
|
|
|
break;
|
|
break;
|
|
case CHIP_FIJI:
|
|
case CHIP_FIJI:
|
|
case CHIP_TONGA:
|
|
case CHIP_TONGA:
|
|
@@ -1419,8 +1417,6 @@ static int vi_common_early_init(void *handle)
|
|
adev->cg_flags = 0;
|
|
adev->cg_flags = 0;
|
|
adev->pg_flags = 0;
|
|
adev->pg_flags = 0;
|
|
adev->external_rev_id = adev->rev_id + 0x14;
|
|
adev->external_rev_id = adev->rev_id + 0x14;
|
|
- if (amdgpu_smc_load_fw && smc_enabled)
|
|
|
|
- adev->firmware.smu_load = true;
|
|
|
|
break;
|
|
break;
|
|
case CHIP_CARRIZO:
|
|
case CHIP_CARRIZO:
|
|
case CHIP_STONEY:
|
|
case CHIP_STONEY:
|
|
@@ -1429,14 +1425,15 @@ static int vi_common_early_init(void *handle)
|
|
/* Disable UVD pg */
|
|
/* Disable UVD pg */
|
|
adev->pg_flags = /* AMDGPU_PG_SUPPORT_UVD | */AMDGPU_PG_SUPPORT_VCE;
|
|
adev->pg_flags = /* AMDGPU_PG_SUPPORT_UVD | */AMDGPU_PG_SUPPORT_VCE;
|
|
adev->external_rev_id = adev->rev_id + 0x1;
|
|
adev->external_rev_id = adev->rev_id + 0x1;
|
|
- if (amdgpu_smc_load_fw && smc_enabled)
|
|
|
|
- adev->firmware.smu_load = true;
|
|
|
|
break;
|
|
break;
|
|
default:
|
|
default:
|
|
/* FIXME: not supported yet */
|
|
/* FIXME: not supported yet */
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ if (amdgpu_smc_load_fw && smc_enabled)
|
|
|
|
+ adev->firmware.smu_load = true;
|
|
|
|
+
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
|