aboutsummaryrefslogtreecommitdiffstats
path: root/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3698-drm-amdgpu-Fix-undefined-dm_ip_block-for-navi12.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3698-drm-amdgpu-Fix-undefined-dm_ip_block-for-navi12.patch')
-rw-r--r--meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3698-drm-amdgpu-Fix-undefined-dm_ip_block-for-navi12.patch33
1 files changed, 33 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3698-drm-amdgpu-Fix-undefined-dm_ip_block-for-navi12.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3698-drm-amdgpu-Fix-undefined-dm_ip_block-for-navi12.patch
new file mode 100644
index 00000000..16d861f0
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3698-drm-amdgpu-Fix-undefined-dm_ip_block-for-navi12.patch
@@ -0,0 +1,33 @@
+From ae25c97b48c92242369c5d4dcb7284cb7871500b Mon Sep 17 00:00:00 2001
+From: Petr Cvek <petrcvekcz@gmail.com>
+Date: Fri, 30 Aug 2019 16:31:58 +0200
+Subject: [PATCH 3698/4256] drm/amdgpu: Fix undefined dm_ip_block for navi12
+
+There is missing "if defined" CONFIG_DRM_AMD_DC block for non DC
+configurations. This will cause link error. The patch is fixing that.
+
+Bug: https://bugs.freedesktop.org/show_bug.cgi?id=110979
+Signed-off-by: Petr Cvek <petrcvekcz@gmail.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/nv.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/nv.c b/drivers/gpu/drm/amd/amdgpu/nv.c
+index 585fc7dce39d..a61f43c0c9df 100644
+--- a/drivers/gpu/drm/amd/amdgpu/nv.c
++++ b/drivers/gpu/drm/amd/amdgpu/nv.c
+@@ -461,8 +461,10 @@ int nv_set_ip_blocks(struct amdgpu_device *adev)
+ amdgpu_device_ip_block_add(adev, &smu_v11_0_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)
+ else if (amdgpu_device_has_dc_support(adev))
+ amdgpu_device_ip_block_add(adev, &dm_ip_block);
++#endif
+ amdgpu_device_ip_block_add(adev, &gfx_v10_0_ip_block);
+ amdgpu_device_ip_block_add(adev, &sdma_v5_0_ip_block);
+ if (adev->firmware.load_type == AMDGPU_FW_LOAD_DIRECT &&
+--
+2.17.1
+