From: Alex Deucher Date: Wed, 19 Apr 2017 21:28:47 +0000 (-0400) Subject: drm/amdgpu/soc15: enable dc on vega10 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ab587d4a654ea299bef20bf3d363f7faaea35e7d;p=openwrt%2Fstaging%2Fblogic.git drm/amdgpu/soc15: enable dc on vega10 Add the DC display module to drive the DCE12 IP on vega10. Signed-off-by: Alex Deucher --- 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);