drm/amd/amdgpu: Convert DC warning to runtime warning.
Subsystems (2)
PATCH 1/1 drm/amd/amdgpu: Convert DC warning to runtime warning.
Use DRM_WARN instead of preprocessor warning so that pre-built kernels will warn if DC is disabled on SOC15 ASICs.
Signed-off-by Tom St Denis <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/soc15.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/soc15.c +5 -3
@@ -529,7 +529,8 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev) else if (amdgpu_device_has_dc_support(adev)) amdgpu_device_ip_block_add(adev, &dm_ip_block);#else -# warning "Enable CONFIG_DRM_AMD_DC for display support on SOC15." + else + DRM_WARN("DC Not enabled for SOC15 device.");#endif amdgpu_device_ip_block_add (adev, &gfx_v9_0_ip_block);amdgpu_device_ip_block_add (adev, &sdma_v4_0_ip_block);
@@ -544,11 +545,12 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)amdgpu_device_ip_block_add (adev, &pp_smu_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 ) +#if defined(CONFIG_DRM_AMD_DC ) && defined(CONFIG_DRM_AMD_DC_DCN1_0 ) else if (amdgpu_device_has_dc_support(adev)) amdgpu_device_ip_block_add(adev, &dm_ip_block);#else -# warning "Enable CONFIG_DRM_AMD_DC for display support on SOC15." + else + DRM_WARN("DC Not enabled for SOC15 device.");#endif amdgpu_device_ip_block_add (adev, &gfx_v9_0_ip_block);amdgpu_device_ip_block_add (adev, &sdma_v4_0_ip_block);
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx