diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2016-02-01 19:43:28 +0300 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2016-02-10 22:17:13 +0300 |
| commit | b87c032b4b0c3a82936c16f9f3c984c7408dabb6 (patch) | |
| tree | f2a66a208c47b8efd397424f09182d5eff9cf4a5 /drivers/gpu/drm/amd/amdgpu/iceland_smc.c | |
| parent | c12d287119e3a36bbb7054e5dfcd7825c50870d6 (diff) | |
| download | linux-b87c032b4b0c3a82936c16f9f3c984c7408dabb6.tar.xz | |
drm/amdgpu/smu: skip SMC ucode loading on SR-IOV capable boards (v2)
VBIOS does this for us in asic_init.
v2: update iceland as well
Reviewed-by: Monk Liu <monk.liu@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/iceland_smc.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/iceland_smc.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/iceland_smc.c b/drivers/gpu/drm/amd/amdgpu/iceland_smc.c index 090486c18249..52ee08193295 100644 --- a/drivers/gpu/drm/amd/amdgpu/iceland_smc.c +++ b/drivers/gpu/drm/amd/amdgpu/iceland_smc.c @@ -279,6 +279,12 @@ static int iceland_smu_upload_firmware_image(struct amdgpu_device *adev) if (!adev->pm.fw) return -EINVAL; + /* Skip SMC ucode loading on SR-IOV capable boards. + * vbios does this for us in asic_init in that case. + */ + if (adev->virtualization.supports_sr_iov) + return 0; + hdr = (const struct smc_firmware_header_v1_0 *)adev->pm.fw->data; amdgpu_ucode_print_smc_hdr(&hdr->header); |