drm/amdgpu/cik: add IP modules for DC for APUs

Enable DC for DCE8 APUs.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/cik.c b/drivers/gpu/drm/amd/amdgpu/cik.c
index af3b66f6f47c93ffaf48ebbb412b5b40ab473018..793b1470284d67b13c68954481520f7ab3ef635e 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/cik.c
+++ b/drivers/gpu/drm/amd/amdgpu/cik.c
@@ -1937,6 +1937,10 @@ int cik_set_ip_blocks(struct amdgpu_device *adev)
                amdgpu_ip_block_add(adev, &amdgpu_pp_ip_block);
                if (adev->enable_virtual_display)
                        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);
+#endif
                else
                        amdgpu_ip_block_add(adev, &dce_v8_1_ip_block);
                amdgpu_ip_block_add(adev, &gfx_v7_1_ip_block);
@@ -1952,6 +1956,10 @@ int cik_set_ip_blocks(struct amdgpu_device *adev)
                amdgpu_ip_block_add(adev, &amdgpu_pp_ip_block);
                if (adev->enable_virtual_display)
                        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);
+#endif
                else
                        amdgpu_ip_block_add(adev, &dce_v8_3_ip_block);
                amdgpu_ip_block_add(adev, &gfx_v7_2_ip_block);