diff options
author | Alex Deucher <alexander.deucher@amd.com> | 2017-06-02 14:54:26 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2017-09-26 18:07:29 -0400 |
commit | 0bf954c154d7a8989afb6c138d63ca846bab47db (patch) | |
tree | 77090011c1955ca365401b3994c537b14bd8d15c /drivers/gpu | |
parent | 21de3396b44a67429c6b6a3f2d697fb261c76054 (diff) |
drm/amdgpu/soc15: enable DC ip module for Raven
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/soc15.c | 6 |
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 3d9a51d6e1aa..c2611eca8495 100644 --- a/drivers/gpu/drm/amd/amdgpu/soc15.c +++ b/drivers/gpu/drm/amd/amdgpu/soc15.c | |||
@@ -554,6 +554,12 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev) | |||
554 | amdgpu_ip_block_add(adev, &amdgpu_pp_ip_block); | 554 | amdgpu_ip_block_add(adev, &amdgpu_pp_ip_block); |
555 | if (adev->enable_virtual_display || amdgpu_sriov_vf(adev)) | 555 | if (adev->enable_virtual_display || amdgpu_sriov_vf(adev)) |
556 | amdgpu_ip_block_add(adev, &dce_virtual_ip_block); | 556 | amdgpu_ip_block_add(adev, &dce_virtual_ip_block); |
557 | #if defined(CONFIG_DRM_AMD_DC) | ||
558 | else if (amdgpu_device_has_dc_support(adev)) | ||
559 | amdgpu_ip_block_add(adev, &dm_ip_block); | ||
560 | #else | ||
561 | # warning "Enable CONFIG_DRM_AMD_DC for display support on SOC15." | ||
562 | #endif | ||
557 | amdgpu_ip_block_add(adev, &gfx_v9_0_ip_block); | 563 | amdgpu_ip_block_add(adev, &gfx_v9_0_ip_block); |
558 | amdgpu_ip_block_add(adev, &sdma_v4_0_ip_block); | 564 | amdgpu_ip_block_add(adev, &sdma_v4_0_ip_block); |
559 | amdgpu_ip_block_add(adev, &vcn_v1_0_ip_block); | 565 | amdgpu_ip_block_add(adev, &vcn_v1_0_ip_block); |