diff options
Diffstat (limited to 'common/recipes-kernel/linux/files/0264-drm-amdgpu-smu-skip-SMC-ucode-loading-on-SR-IOV-capa.patch')
| -rw-r--r-- | common/recipes-kernel/linux/files/0264-drm-amdgpu-smu-skip-SMC-ucode-loading-on-SR-IOV-capa.patch | 76 |
1 files changed, 76 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/files/0264-drm-amdgpu-smu-skip-SMC-ucode-loading-on-SR-IOV-capa.patch b/common/recipes-kernel/linux/files/0264-drm-amdgpu-smu-skip-SMC-ucode-loading-on-SR-IOV-capa.patch new file mode 100644 index 00000000..23ce2000 --- /dev/null +++ b/common/recipes-kernel/linux/files/0264-drm-amdgpu-smu-skip-SMC-ucode-loading-on-SR-IOV-capa.patch @@ -0,0 +1,76 @@ +From 41f377189cfbb06787d975219c57053667c4abe3 Mon Sep 17 00:00:00 2001 +From: Alex Deucher <alexander.deucher@amd.com> +Date: Mon, 1 Feb 2016 11:43:28 -0500 +Subject: [PATCH 0264/1110] drm/amdgpu/smu: skip SMC ucode loading on SR-IOV + capable boards (v2) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +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> +--- + drivers/gpu/drm/amd/amdgpu/fiji_smc.c | 6 ++++++ + drivers/gpu/drm/amd/amdgpu/iceland_smc.c | 6 ++++++ + drivers/gpu/drm/amd/amdgpu/tonga_smc.c | 6 ++++++ + 3 files changed, 18 insertions(+) + +diff --git a/drivers/gpu/drm/amd/amdgpu/fiji_smc.c b/drivers/gpu/drm/amd/amdgpu/fiji_smc.c +index e35340a..b336c91 100644 +--- a/drivers/gpu/drm/amd/amdgpu/fiji_smc.c ++++ b/drivers/gpu/drm/amd/amdgpu/fiji_smc.c +@@ -272,6 +272,12 @@ static int fiji_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); + +diff --git a/drivers/gpu/drm/amd/amdgpu/iceland_smc.c b/drivers/gpu/drm/amd/amdgpu/iceland_smc.c +index 090486c..52ee081 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); + +diff --git a/drivers/gpu/drm/amd/amdgpu/tonga_smc.c b/drivers/gpu/drm/amd/amdgpu/tonga_smc.c +index 361c49a..083893d 100644 +--- a/drivers/gpu/drm/amd/amdgpu/tonga_smc.c ++++ b/drivers/gpu/drm/amd/amdgpu/tonga_smc.c +@@ -272,6 +272,12 @@ static int tonga_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); + +-- +2.7.4 + |