[PATCH 1/2] drm/amd/display: Clean Kconfig formatting

[PATCH 1/2] drm/amd/display: Clean Kconfig formatting

[Harry Wentland]

Signed-off-by: Harry Wentland <harry.wentland@amd.com>
---
 drivers/gpu/drm/amd/display/Kconfig | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/Kconfig b/drivers/gpu/drm/amd/display/Kconfig
index 62ea9f600374..e91b6e57cf03 100644
--- a/drivers/gpu/drm/amd/display/Kconfig
+++ b/drivers/gpu/drm/amd/display/Kconfig
@@ -2,26 +2,25 @@ menu "Display Engine Configuration"
 	depends on DRM && DRM_AMDGPU
 
 config DRM_AMD_DC
-        bool "AMD DC - Enable new display engine (will be deprecated when the development is done)"
-        help
-          Choose this option if you want to use the new display engine
-          support for AMDGPU.
-
-          Will be deprecated when the DC component is upstream.
+	bool "AMD DC - Enable new display engine
+	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_DCN1_0
-        bool "DCN 1.0 Raven family"
-        depends on DRM_AMD_DC && X86
-        help
-            Choose this option if you want to have
-            RV family for display engine
+	bool "DCN 1.0 Raven family"
+	depends on DRM_AMD_DC && X86
+	help
+	  Choose this option if you want to have
+	  RV family for display engine
 
 config DEBUG_KERNEL_DC
-        bool "Enable kgdb break in DC"
-        depends on DRM_AMD_DC
-        help
-         Choose this option
-         if you want to hit
-         kdgb_break in assert.
+	bool "Enable kgdb break in DC"
+	depends on DRM_AMD_DC
+	help
+	  Choose this option
+	  if you want to hit
+	  kdgb_break in assert.
 
 endmenu
-- 
2.11.0

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

[PATCH 2/2] drm/amd/display: Disable pre-Vega ASICs be default

[Harry Wentland]

Signed-off-by: Harry Wentland <harry.wentland@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..4d2816e01bf0 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 use the new DC driver for Polaris, Carrizo,
+	  Tonga, Bonaire, and Hawaii.
+
 config DRM_AMD_DC_DCN1_0
 	bool "DCN 1.0 Raven family"
 	depends on DRM_AMD_DC && X86
-- 
2.11.0

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

RE: [PATCH 1/2] drm/amd/display: Clean Kconfig formatting

[Deucher, Alexander]

> -----Original Message-----
> From: Harry Wentland [mailto:harry.wentland@amd.com]
> Sent: Tuesday, September 12, 2017 10:58 AM
> To: amd-gfx@lists.freedesktop.org
> Cc: airlied@gmail.com; Deucher, Alexander; daniel@ffwll.ch; Wentland,
> Harry
> Subject: [PATCH 1/2] drm/amd/display: Clean Kconfig formatting
> 
> Signed-off-by: Harry Wentland <harry.wentland@amd.com>

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

> ---
>  drivers/gpu/drm/amd/display/Kconfig | 33 ++++++++++++++++---------------
> --
>  1 file changed, 16 insertions(+), 17 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/display/Kconfig
> b/drivers/gpu/drm/amd/display/Kconfig
> index 62ea9f600374..e91b6e57cf03 100644
> --- a/drivers/gpu/drm/amd/display/Kconfig
> +++ b/drivers/gpu/drm/amd/display/Kconfig
> @@ -2,26 +2,25 @@ menu "Display Engine Configuration"
>  	depends on DRM && DRM_AMDGPU
> 
>  config DRM_AMD_DC
> -        bool "AMD DC - Enable new display engine (will be deprecated when
> the development is done)"
> -        help
> -          Choose this option if you want to use the new display engine
> -          support for AMDGPU.
> -
> -          Will be deprecated when the DC component is upstream.
> +	bool "AMD DC - Enable new display engine
> +	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_DCN1_0
> -        bool "DCN 1.0 Raven family"
> -        depends on DRM_AMD_DC && X86
> -        help
> -            Choose this option if you want to have
> -            RV family for display engine
> +	bool "DCN 1.0 Raven family"
> +	depends on DRM_AMD_DC && X86
> +	help
> +	  Choose this option if you want to have
> +	  RV family for display engine
> 
>  config DEBUG_KERNEL_DC
> -        bool "Enable kgdb break in DC"
> -        depends on DRM_AMD_DC
> -        help
> -         Choose this option
> -         if you want to hit
> -         kdgb_break in assert.
> +	bool "Enable kgdb break in DC"
> +	depends on DRM_AMD_DC
> +	help
> +	  Choose this option
> +	  if you want to hit
> +	  kdgb_break in assert.
> 
>  endmenu
> --
> 2.11.0

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

RE: [PATCH 2/2] drm/amd/display: Disable pre-Vega ASICs be default

[Deucher, Alexander]

> -----Original Message-----
> From: amd-gfx [mailto:amd-gfx-bounces@lists.freedesktop.org] On Behalf
> Of Harry Wentland
> Sent: Tuesday, September 12, 2017 10:58 AM
> To: amd-gfx@lists.freedesktop.org
> Cc: Deucher, Alexander; Wentland, Harry; airlied@gmail.com;
> daniel@ffwll.ch
> Subject: [PATCH 2/2] drm/amd/display: Disable pre-Vega ASICs be default
> 
> Signed-off-by: Harry Wentland <harry.wentland@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..4d2816e01bf0 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 use the new DC driver for Polaris, Carrizo,
> +	  Tonga, Bonaire, and Hawaii.


I'd suggest changing the wording of this option to say something like:
"Choose this option to enable the new DC support for older asics by default."
So it's clear this just changes the default behavior, the user can still use DC via module parameter.

Alex

> +
>  config DRM_AMD_DC_DCN1_0
>  	bool "DCN 1.0 Raven family"
>  	depends on DRM_AMD_DC && X86
> --
> 2.11.0
> 
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx