Re: [PATCH] drm/amd/amdgpu: hide #warning for missing DC config

2019-07-15 Thread Alex Deucher 
On Fri, Jul 12, 2019 at 5:41 AM Arnd Bergmann  wrote:
>
> It is annoying to have #warnings that trigger in randconfig
> builds like
>
> drivers/gpu/drm/amd/amdgpu/soc15.c:653:3: error: "Enable CONFIG_DRM_AMD_DC 
> for display support on SOC15."
> drivers/gpu/drm/amd/amdgpu/nv.c:400:3: error: "Enable CONFIG_DRM_AMD_DC for 
> display support on navi."
>
> Remove these and rely on the users to turn these on.
>
> Signed-off-by: Arnd Bergmann 

Applied.  thanks!

Alex

> ---
>  drivers/gpu/drm/amd/amdgpu/nv.c| 2 --
>  drivers/gpu/drm/amd/amdgpu/soc15.c | 4 
>  2 files changed, 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/nv.c b/drivers/gpu/drm/amd/amdgpu/nv.c
> index 9253c03d387a..10ec0e81ee58 100644
> --- a/drivers/gpu/drm/amd/amdgpu/nv.c
> +++ b/drivers/gpu/drm/amd/amdgpu/nv.c
> @@ -396,8 +396,6 @@ int nv_set_ip_blocks(struct amdgpu_device *adev)
>  #if defined(CONFIG_DRM_AMD_DC)
> else if (amdgpu_device_has_dc_support(adev))
> amdgpu_device_ip_block_add(adev, _ip_block);
> -#else
> -#  warning "Enable CONFIG_DRM_AMD_DC for display support on navi."
>  #endif
> amdgpu_device_ip_block_add(adev, _v10_0_ip_block);
> amdgpu_device_ip_block_add(adev, _v5_0_ip_block);
> diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c 
> b/drivers/gpu/drm/amd/amdgpu/soc15.c
> index 87152d8ef0df..90fb0149fbea 100644
> --- a/drivers/gpu/drm/amd/amdgpu/soc15.c
> +++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
> @@ -649,8 +649,6 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)
>  #if defined(CONFIG_DRM_AMD_DC)
> else if (amdgpu_device_has_dc_support(adev))
> amdgpu_device_ip_block_add(adev, _ip_block);
> -#else
> -#  warning "Enable CONFIG_DRM_AMD_DC for display support on SOC15."
>  #endif
> if (!(adev->asic_type == CHIP_VEGA20 && 
> amdgpu_sriov_vf(adev))) {
> amdgpu_device_ip_block_add(adev, _v7_0_ip_block);
> @@ -671,8 +669,6 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)
>  #if defined(CONFIG_DRM_AMD_DC)
> else if (amdgpu_device_has_dc_support(adev))
> amdgpu_device_ip_block_add(adev, _ip_block);
> -#else
> -#  warning "Enable CONFIG_DRM_AMD_DC for display support on SOC15."
>  #endif
> amdgpu_device_ip_block_add(adev, _v1_0_ip_block);
> break;
> --
> 2.20.0
>
> ___
> dri-devel mailing list
> dri-de...@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
___
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH] drm/amd/amdgpu: hide #warning for missing DC config

2019-07-12 Thread Arnd Bergmann 
On Fri, Jul 12, 2019 at 8:02 PM Alex Deucher  wrote:
>
> On Fri, Jul 12, 2019 at 5:41 AM Arnd Bergmann  wrote:
> >
> > It is annoying to have #warnings that trigger in randconfig
> > builds like
> >
> > drivers/gpu/drm/amd/amdgpu/soc15.c:653:3: error: "Enable CONFIG_DRM_AMD_DC 
> > for display support on SOC15."
> > drivers/gpu/drm/amd/amdgpu/nv.c:400:3: error: "Enable CONFIG_DRM_AMD_DC for 
> > display support on navi."
> >
> > Remove these and rely on the users to turn these on.
>
> Is there some sort of informational message we could use instead?
> Unless you are a server user, most end users want this option enabled.

I don't think any compile-time output is a good idea here, a 'make -s'
build should really have no output whatsoever (and usually does).

I see that DRM_AMD_DC is already 'default y', which I would hope
to be sufficient. If you want something stronger than that, you could
make hide the option and leave it always-on unless CONFIG_EXPERT
is enabled:

diff --git a/drivers/gpu/drm/amd/display/Kconfig
b/drivers/gpu/drm/amd/display/Kconfig
index 2cfbbf3b85dd..9862a193349a 100644
--- a/drivers/gpu/drm/amd/display/Kconfig
+++ b/drivers/gpu/drm/amd/display/Kconfig
@@ -3,7 +3,7 @@ menu "Display Engine Configuration"
depends on DRM && DRM_AMDGPU

 config DRM_AMD_DC
-   bool "AMD DC - Enable new display engine"
+   bool "AMD DC - Enable new display engine" if EXPERT
default y
select SND_HDA_COMPONENT if SND_HDA_CORE
select DRM_AMD_DC_DCN1_0 if X86 && !(KCOV_INSTRUMENT_ALL &&
KCOV_ENABLE_COMPARISONS) && !CC_IS_CLANG

Re: [PATCH] drm/amd/amdgpu: hide #warning for missing DC config

2019-07-12 Thread Alex Deucher 
On Fri, Jul 12, 2019 at 5:41 AM Arnd Bergmann  wrote:
>
> It is annoying to have #warnings that trigger in randconfig
> builds like
>
> drivers/gpu/drm/amd/amdgpu/soc15.c:653:3: error: "Enable CONFIG_DRM_AMD_DC 
> for display support on SOC15."
> drivers/gpu/drm/amd/amdgpu/nv.c:400:3: error: "Enable CONFIG_DRM_AMD_DC for 
> display support on navi."
>
> Remove these and rely on the users to turn these on.

Is there some sort of informational message we could use instead?
Unless you are a server user, most end users want this option enabled.

Alex

>
> Signed-off-by: Arnd Bergmann 
> ---
>  drivers/gpu/drm/amd/amdgpu/nv.c| 2 --
>  drivers/gpu/drm/amd/amdgpu/soc15.c | 4 
>  2 files changed, 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/nv.c b/drivers/gpu/drm/amd/amdgpu/nv.c
> index 9253c03d387a..10ec0e81ee58 100644
> --- a/drivers/gpu/drm/amd/amdgpu/nv.c
> +++ b/drivers/gpu/drm/amd/amdgpu/nv.c
> @@ -396,8 +396,6 @@ int nv_set_ip_blocks(struct amdgpu_device *adev)
>  #if defined(CONFIG_DRM_AMD_DC)
> else if (amdgpu_device_has_dc_support(adev))
> amdgpu_device_ip_block_add(adev, _ip_block);
> -#else
> -#  warning "Enable CONFIG_DRM_AMD_DC for display support on navi."
>  #endif
> amdgpu_device_ip_block_add(adev, _v10_0_ip_block);
> amdgpu_device_ip_block_add(adev, _v5_0_ip_block);
> diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c 
> b/drivers/gpu/drm/amd/amdgpu/soc15.c
> index 87152d8ef0df..90fb0149fbea 100644
> --- a/drivers/gpu/drm/amd/amdgpu/soc15.c
> +++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
> @@ -649,8 +649,6 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)
>  #if defined(CONFIG_DRM_AMD_DC)
> else if (amdgpu_device_has_dc_support(adev))
> amdgpu_device_ip_block_add(adev, _ip_block);
> -#else
> -#  warning "Enable CONFIG_DRM_AMD_DC for display support on SOC15."
>  #endif
> if (!(adev->asic_type == CHIP_VEGA20 && 
> amdgpu_sriov_vf(adev))) {
> amdgpu_device_ip_block_add(adev, _v7_0_ip_block);
> @@ -671,8 +669,6 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)
>  #if defined(CONFIG_DRM_AMD_DC)
> else if (amdgpu_device_has_dc_support(adev))
> amdgpu_device_ip_block_add(adev, _ip_block);
> -#else
> -#  warning "Enable CONFIG_DRM_AMD_DC for display support on SOC15."
>  #endif
> amdgpu_device_ip_block_add(adev, _v1_0_ip_block);
> break;
> --
> 2.20.0
>
> ___
> dri-devel mailing list
> dri-de...@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
___
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

[PATCH] drm/amd/amdgpu: hide #warning for missing DC config

2019-07-12 Thread Arnd Bergmann 
It is annoying to have #warnings that trigger in randconfig
builds like

drivers/gpu/drm/amd/amdgpu/soc15.c:653:3: error: "Enable CONFIG_DRM_AMD_DC for 
display support on SOC15."
drivers/gpu/drm/amd/amdgpu/nv.c:400:3: error: "Enable CONFIG_DRM_AMD_DC for 
display support on navi."

Remove these and rely on the users to turn these on.

Signed-off-by: Arnd Bergmann 
---
 drivers/gpu/drm/amd/amdgpu/nv.c| 2 --
 drivers/gpu/drm/amd/amdgpu/soc15.c | 4 
 2 files changed, 6 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/nv.c b/drivers/gpu/drm/amd/amdgpu/nv.c
index 9253c03d387a..10ec0e81ee58 100644
--- a/drivers/gpu/drm/amd/amdgpu/nv.c
+++ b/drivers/gpu/drm/amd/amdgpu/nv.c
@@ -396,8 +396,6 @@ int nv_set_ip_blocks(struct amdgpu_device *adev)
 #if defined(CONFIG_DRM_AMD_DC)
else if (amdgpu_device_has_dc_support(adev))
amdgpu_device_ip_block_add(adev, _ip_block);
-#else
-#  warning "Enable CONFIG_DRM_AMD_DC for display support on navi."
 #endif
amdgpu_device_ip_block_add(adev, _v10_0_ip_block);
amdgpu_device_ip_block_add(adev, _v5_0_ip_block);
diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c 
b/drivers/gpu/drm/amd/amdgpu/soc15.c
index 87152d8ef0df..90fb0149fbea 100644
--- a/drivers/gpu/drm/amd/amdgpu/soc15.c
+++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
@@ -649,8 +649,6 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)
 #if defined(CONFIG_DRM_AMD_DC)
else if (amdgpu_device_has_dc_support(adev))
amdgpu_device_ip_block_add(adev, _ip_block);
-#else
-#  warning "Enable CONFIG_DRM_AMD_DC for display support on SOC15."
 #endif
if (!(adev->asic_type == CHIP_VEGA20 && amdgpu_sriov_vf(adev))) 
{
amdgpu_device_ip_block_add(adev, _v7_0_ip_block);
@@ -671,8 +669,6 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)
 #if defined(CONFIG_DRM_AMD_DC)
else if (amdgpu_device_has_dc_support(adev))
amdgpu_device_ip_block_add(adev, _ip_block);
-#else
-#  warning "Enable CONFIG_DRM_AMD_DC for display support on SOC15."
 #endif
amdgpu_device_ip_block_add(adev, _v1_0_ip_block);
break;
-- 
2.20.0

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