OSDN Git Service

drm/amd/display: Remove PRE_VEGA flag
authorHarry Wentland <harry.wentland@amd.com>
Mon, 9 Apr 2018 18:27:46 +0000 (14:27 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 15 May 2018 18:43:06 +0000 (13:43 -0500)
We enabled this upstream by default now and no longer need the flag.

Signed-off-by: Harry Wentland <harry.wentland@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
drivers/gpu/drm/amd/display/Kconfig

index abc3346..62d6505 100644 (file)
@@ -2093,9 +2093,6 @@ bool amdgpu_device_asic_has_dc_support(enum amd_asic_type asic_type)
        case CHIP_POLARIS12:
        case CHIP_TONGA:
        case CHIP_FIJI:
-#if defined(CONFIG_DRM_AMD_DC_PRE_VEGA)
-               return amdgpu_dc != 0;
-#endif
        case CHIP_VEGA10:
        case CHIP_VEGA12:
 #if defined(CONFIG_DRM_AMD_DC_DCN1_0)
index 5b124a6..d5d4586 100644 (file)
@@ -9,14 +9,6 @@ config DRM_AMD_DC
          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 y
-       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_FBC
        bool "AMD FBC - Enable Frame Buffer Compression"
        depends on DRM_AMD_DC