From: Bhawanpreet Lakha Date: Thu, 21 May 2020 16:57:27 +0000 (-0400) Subject: drm/amdgpu: Enable DM block for DCN3 X-Git-Tag: v5.9-rc1~51^2~25^2~204 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=464ab91ac5f1765c758722a1c298873795773a2f;p=linux-block.git drm/amdgpu: Enable DM block for DCN3 Signed-off-by: Bhawanpreet Lakha Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/nv.c b/drivers/gpu/drm/amd/amdgpu/nv.c index ef3f07dc89cd..a7cfe3ac7cb6 100644 --- a/drivers/gpu/drm/amd/amdgpu/nv.c +++ b/drivers/gpu/drm/amd/amdgpu/nv.c @@ -497,6 +497,10 @@ int nv_set_ip_blocks(struct amdgpu_device *adev) amdgpu_device_ip_block_add(adev, &smu_v11_0_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, &gfx_v10_0_ip_block); amdgpu_device_ip_block_add(adev, &sdma_v5_2_ip_block); amdgpu_device_ip_block_add(adev, &vcn_v3_0_ip_block);