diff options
| author |   Nicholas Kazlauskas <nicholas.kazlauskas@amd.com> | 2021-05-19 12:57:17 -0400 |
|---|---|---|
| committer |   Alex Deucher <alexander.deucher@amd.com> | 2021-06-04 16:39:19 -0400 |
| commit | c8b73f7fdbb117bc839559a8e8f495b700f043af (patch) | |
| tree | 6389373ec44b04fbfd7167bd1c6f1a41123a2b48 /drivers/gpu/drm/amd/amdgpu/nv.c | |
| parent | drm/amd/display: Add DC DCN3.1 support to Kconfig (diff) | |
| download | linux-dev-c8b73f7fdbb117bc839559a8e8f495b700f043af.tar.xz linux-dev-c8b73f7fdbb117bc839559a8e8f495b700f043af.zip | |
drm/amdgpu: Add DC support and display block for Yellow Carp
To enable output on real display instead of virtual.
Acked-by: Huang Rui <ray.huang@amd.com>
Signed-off-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/nv.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/nv.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/nv.c b/drivers/gpu/drm/amd/amdgpu/nv.c index 11b292131c02..455d0425787c 100644 --- a/drivers/gpu/drm/amd/amdgpu/nv.c +++ b/drivers/gpu/drm/amd/amdgpu/nv.c @@ -1001,7 +1001,12 @@ int nv_set_ip_blocks(struct amdgpu_device *adev) amdgpu_device_ip_block_add(adev, &dce_virtual_ip_block); amdgpu_device_ip_block_add(adev, &gfx_v10_0_ip_block); amdgpu_device_ip_block_add(adev, &sdma_v5_2_ip_block); - + if (adev->enable_virtual_display || amdgpu_sriov_vf(adev)) + amdgpu_device_ip_block_add(adev, &dce_virtual_ip_block); +#if defined(CONFIG_DRM_AMD_DC) + else if (amdgpu_device_has_dc_support(adev)) + amdgpu_device_ip_block_add(adev, &dm_ip_block); +#endif amdgpu_device_ip_block_add(adev, &vcn_v3_0_ip_block); amdgpu_device_ip_block_add(adev, &jpeg_v3_0_ip_block); break; |