aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/linux-yocto-4.14.71/4428-drm-amdgpu-Disable-ip-modules-that-are-not-ready-yet.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.14.71/4428-drm-amdgpu-Disable-ip-modules-that-are-not-ready-yet.patch')
-rw-r--r--common/recipes-kernel/linux/linux-yocto-4.14.71/4428-drm-amdgpu-Disable-ip-modules-that-are-not-ready-yet.patch50
1 files changed, 50 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/4428-drm-amdgpu-Disable-ip-modules-that-are-not-ready-yet.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/4428-drm-amdgpu-Disable-ip-modules-that-are-not-ready-yet.patch
new file mode 100644
index 00000000..c68dc3fe
--- /dev/null
+++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/4428-drm-amdgpu-Disable-ip-modules-that-are-not-ready-yet.patch
@@ -0,0 +1,50 @@
+From de1f7371d3f64370230a4864b72e3b364bd75d5d Mon Sep 17 00:00:00 2001
+From: Feifei Xu <Feifei.Xu@amd.com>
+Date: Tue, 24 Apr 2018 11:20:16 +0800
+Subject: [PATCH 4428/5725] drm/amdgpu: Disable ip modules that are not ready
+ yet
+
+Please enable above ips on soc15.c when they're available.
+
+Signed-off-by: Feifei Xu <Feifei.Xu@amd.com>
+Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/soc15.c | 14 +++++++++-----
+ 1 file changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c
+index 91d87f8..8d0d054 100644
+--- a/drivers/gpu/drm/amd/amdgpu/soc15.c
++++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
+@@ -514,9 +514,11 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)
+ amdgpu_device_ip_block_add(adev, &vega10_common_ip_block);
+ amdgpu_device_ip_block_add(adev, &gmc_v9_0_ip_block);
+ amdgpu_device_ip_block_add(adev, &vega10_ih_ip_block);
+- amdgpu_device_ip_block_add(adev, &psp_v3_1_ip_block);
+- if (!amdgpu_sriov_vf(adev))
+- amdgpu_device_ip_block_add(adev, &pp_smu_ip_block);
++ if (adev->asic_type != CHIP_VEGA20) {
++ amdgpu_device_ip_block_add(adev, &psp_v3_1_ip_block);
++ if (!amdgpu_sriov_vf(adev))
++ amdgpu_device_ip_block_add(adev, &pp_smu_ip_block);
++ }
+ if (adev->enable_virtual_display || amdgpu_sriov_vf(adev))
+ amdgpu_device_ip_block_add(adev, &dce_virtual_ip_block);
+ #if defined(CONFIG_DRM_AMD_DC)
+@@ -527,8 +529,10 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)
+ #endif
+ amdgpu_device_ip_block_add(adev, &gfx_v9_0_ip_block);
+ amdgpu_device_ip_block_add(adev, &sdma_v4_0_ip_block);
+- amdgpu_device_ip_block_add(adev, &uvd_v7_0_ip_block);
+- amdgpu_device_ip_block_add(adev, &vce_v4_0_ip_block);
++ if (adev->asic_type != CHIP_VEGA20) {
++ amdgpu_device_ip_block_add(adev, &uvd_v7_0_ip_block);
++ amdgpu_device_ip_block_add(adev, &vce_v4_0_ip_block);
++ }
+ break;
+ case CHIP_RAVEN:
+ amdgpu_device_ip_block_add(adev, &vega10_common_ip_block);
+--
+2.7.4
+