v2: Clarify help text for pre-vega config v3: Refer to older ASIC in more generic DCE 8,10,11 fashion Signed-off-by: Harry Wentland <harry.wentland at amd.com> --- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 ++ drivers/gpu/drm/amd/display/Kconfig | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index 34671790ce80..8c496a57788f 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -1995,7 +1995,9 @@ bool amdgpu_device_asic_has_dc_support(enum amd_asic_type asic_type) case CHIP_TONGA: case CHIP_FIJI: case CHIP_VEGA10: +#if defined(CONFIG_DRM_AMD_DC_PRE_VEGA) return amdgpu_dc != 0; +#endif case CHIP_KABINI: case CHIP_MULLINS: return amdgpu_dc > 0; diff --git a/drivers/gpu/drm/amd/display/Kconfig b/drivers/gpu/drm/amd/display/Kconfig index e91b6e57cf03..1d1a5f807030 100644 --- a/drivers/gpu/drm/amd/display/Kconfig +++ b/drivers/gpu/drm/amd/display/Kconfig @@ -3,11 +3,19 @@ menu "Display Engine Configuration" config DRM_AMD_DC bool "AMD DC - Enable new display engine + default y help Choose this option if you want to use the new display engine support for AMDGPU. This adds required support for Vega and Raven ASICs. +config DRM_AMD_DC_PRE_VEGA + bool "DC support for Polaris and older ASICs" + default n + help + Choose this option to enable the new DC support for older asics + by default. This includes DCE 8, 10, and 11. + config DRM_AMD_DC_DCN1_0 bool "DCN 1.0 Raven family" depends on DRM_AMD_DC && X86 -- 2.11.0
