diff options
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/soc15.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/soc15.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c index 3ca9d114f630..4e67fe1e7955 100644 --- a/drivers/gpu/drm/amd/amdgpu/soc15.c +++ b/drivers/gpu/drm/amd/amdgpu/soc15.c | |||
| @@ -532,6 +532,12 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev) | |||
| 532 | amdgpu_ip_block_add(adev, &amdgpu_pp_ip_block); | 532 | amdgpu_ip_block_add(adev, &amdgpu_pp_ip_block); |
| 533 | if (adev->enable_virtual_display || amdgpu_sriov_vf(adev)) | 533 | if (adev->enable_virtual_display || amdgpu_sriov_vf(adev)) |
| 534 | amdgpu_ip_block_add(adev, &dce_virtual_ip_block); | 534 | amdgpu_ip_block_add(adev, &dce_virtual_ip_block); |
| 535 | #if defined(CONFIG_DRM_AMD_DC) | ||
| 536 | else if (amdgpu_device_has_dc_support(adev)) | ||
| 537 | amdgpu_ip_block_add(adev, &dm_ip_block); | ||
| 538 | #else | ||
| 539 | # warning "Enable CONFIG_DRM_AMD_DC for display support on SOC15." | ||
| 540 | #endif | ||
| 535 | amdgpu_ip_block_add(adev, &gfx_v9_0_ip_block); | 541 | amdgpu_ip_block_add(adev, &gfx_v9_0_ip_block); |
| 536 | amdgpu_ip_block_add(adev, &sdma_v4_0_ip_block); | 542 | amdgpu_ip_block_add(adev, &sdma_v4_0_ip_block); |
| 537 | amdgpu_ip_block_add(adev, &uvd_v7_0_ip_block); | 543 | amdgpu_ip_block_add(adev, &uvd_v7_0_ip_block); |
| @@ -545,6 +551,12 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev) | |||
| 545 | amdgpu_ip_block_add(adev, &amdgpu_pp_ip_block); | 551 | amdgpu_ip_block_add(adev, &amdgpu_pp_ip_block); |
| 546 | if (adev->enable_virtual_display || amdgpu_sriov_vf(adev)) | 552 | if (adev->enable_virtual_display || amdgpu_sriov_vf(adev)) |
| 547 | amdgpu_ip_block_add(adev, &dce_virtual_ip_block); | 553 | amdgpu_ip_block_add(adev, &dce_virtual_ip_block); |
| 554 | #if defined(CONFIG_DRM_AMD_DC) | ||
| 555 | else if (amdgpu_device_has_dc_support(adev)) | ||
| 556 | amdgpu_ip_block_add(adev, &dm_ip_block); | ||
| 557 | #else | ||
| 558 | # warning "Enable CONFIG_DRM_AMD_DC for display support on SOC15." | ||
| 559 | #endif | ||
| 548 | amdgpu_ip_block_add(adev, &gfx_v9_0_ip_block); | 560 | amdgpu_ip_block_add(adev, &gfx_v9_0_ip_block); |
| 549 | amdgpu_ip_block_add(adev, &sdma_v4_0_ip_block); | 561 | amdgpu_ip_block_add(adev, &sdma_v4_0_ip_block); |
| 550 | amdgpu_ip_block_add(adev, &vcn_v1_0_ip_block); | 562 | amdgpu_ip_block_add(adev, &vcn_v1_0_ip_block); |