From: Alex Deucher Date: Mon, 1 Feb 2016 16:29:54 +0000 (-0500) Subject: drm/amdgpu/gmc8: skip MC ucode loading on SR-IOV capable boards X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c12d287119e3a36bbb7054e5dfcd7825c50870d6;p=linux-beck.git drm/amdgpu/gmc8: skip MC ucode loading on SR-IOV capable boards VBIOS does this for us in asic_init. Reviewed-by: Monk Liu Reviewed-by: Christian König Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c index 7011f8b2971a..ca0a0c666b71 100644 --- a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c @@ -252,6 +252,12 @@ static int gmc_v8_0_mc_load_microcode(struct amdgpu_device *adev) if (!adev->mc.fw) return -EINVAL; + /* Skip MC 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 mc_firmware_header_v1_0 *)adev->mc.fw->data; amdgpu_ucode_print_mc_hdr(&hdr->header);