drm/amdgpu: Fix undefined dm_ip_block for navi12
authorPetr Cvek <petrcvekcz@gmail.com>
Fri, 30 Aug 2019 14:31:58 +0000 (16:31 +0200)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 30 Aug 2019 20:37:17 +0000 (15:37 -0500)
There is missing "if defined" CONFIG_DRM_AMD_DC block for non DC
configurations. This will cause link error. The patch is fixing that.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=110979
Signed-off-by: Petr Cvek <petrcvekcz@gmail.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/nv.c

index 1b476fcd21971eacf982c7fe4d03220d579016d9..85393a99a848be702ba1d5f0faa44d0a3b139784 100644 (file)
@@ -460,8 +460,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_0_ip_block);
                if (adev->firmware.load_type == AMDGPU_FW_LOAD_DIRECT &&