On 2017-10-02 11:38 AM, Kuehling, Felix wrote: > This treats Vega10 and Pre-Vega10 the same way. I don't understand how this implements Vega10-specific behavior. > Thanks for spotting this. This merged wrong when cherry-picking it from the upstream tree as it was sitting on a much older commit there. Harry > Regards, > Felix > > -----Original Message----- > From: amd-gfx [mailto:amd-gfx-bounces at lists.freedesktop.org] On Behalf Of Harry Wentland > Sent: Monday, October 02, 2017 11:32 AM > To: amd-gfx at lists.freedesktop.org > Cc: Wentland, Harry > Subject: [PATCH 6/7] drm/amd/display: Disable pre-Vega ASICs by default > > v2: Clarify help text for pre-vega config > > 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 | 9 +++++++++ > 2 files changed, 11 insertions(+) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > index 24f6e3c1b114..03e86e4c108f 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > @@ -1998,7 +1998,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 96a571f6d373..6d1086d0a277 100644 > --- a/drivers/gpu/drm/amd/display/Kconfig > +++ b/drivers/gpu/drm/amd/display/Kconfig > @@ -3,11 +3,20 @@ 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 Polaris, Carrizo, Tonga, Bonaire, > + and Hawaii. > + > config DRM_AMD_DC_DCN1_0 > bool "DCN 1.0 Raven family" > depends on DRM_AMD_DC && X86 >
