summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/soc15.c
diff options
context:
space:
mode:
authorAlex Deucher2017-04-19 23:28:47 +0200
committerAlex Deucher2017-09-26 23:19:39 +0200
commitab587d4a654ea299bef20bf3d363f7faaea35e7d (patch)
treee63539e4a170499d81462f02f72289c19c884176 /drivers/gpu/drm/amd/amdgpu/soc15.c
parentdrm/amd/display: Remove DCE12 guards (diff)
downloadkernel-qcow2-linux-ab587d4a654ea299bef20bf3d363f7faaea35e7d.tar.gz
kernel-qcow2-linux-ab587d4a654ea299bef20bf3d363f7faaea35e7d.tar.xz
kernel-qcow2-linux-ab587d4a654ea299bef20bf3d363f7faaea35e7d.zip
drm/amdgpu/soc15: enable dc on vega10
Add the DC display module to drive the DCE12 IP on vega10. Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/soc15.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/soc15.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c
index 245a18aeb389..3d9a51d6e1aa 100644
--- a/drivers/gpu/drm/amd/amdgpu/soc15.c
+++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
@@ -535,6 +535,12 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)
amdgpu_ip_block_add(adev, &amdgpu_pp_ip_block);
if (adev->enable_virtual_display || amdgpu_sriov_vf(adev))
amdgpu_ip_block_add(adev, &dce_virtual_ip_block);
+#if defined(CONFIG_DRM_AMD_DC)
+ else if (amdgpu_device_has_dc_support(adev))
+ amdgpu_ip_block_add(adev, &dm_ip_block);
+#else
+# warning "Enable CONFIG_DRM_AMD_DC for display support on SOC15."
+#endif
amdgpu_ip_block_add(adev, &gfx_v9_0_ip_block);
amdgpu_ip_block_add(adev, &sdma_v4_0_ip_block);
amdgpu_ip_block_add(adev, &uvd_v7_0_ip_block);