Skip to contentSkip to conversation

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

PATCH Applied Arnd Bergmann 2 participants 4 messages Jul 12, 2019 – Jul 15, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

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

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.

---
 drivers/gpu/drm/amd/amdgpu/nv.c    | 2 --
 drivers/gpu/drm/amd/amdgpu/soc15.c | 4 ----
 2 files changed, 6 deletions(-)
drivers/gpu/drm/amd/amdgpu/nv.c +0 -2
index 9253c03d387a..10ec0e81ee58 100644
@@ -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, &dm_ip_block);
-#else
-#	warning "Enable CONFIG_DRM_AMD_DC for display support on navi."
 #endif
 		amdgpu_device_ip_block_add(adev, &gfx_v10_0_ip_block);
 		amdgpu_device_ip_block_add(adev, &sdma_v5_0_ip_block);
drivers/gpu/drm/amd/amdgpu/soc15.c +0 -4
index 87152d8ef0df..90fb0149fbea 100644
@@ -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, &dm_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, &uvd_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, &dm_ip_block);
-#else
-#	warning "Enable CONFIG_DRM_AMD_DC for display support on SOC15."
 #endif
 		amdgpu_device_ip_block_add(adev, &vcn_v1_0_ip_block);
 		break;
Signature · 6 lines
2.20.0

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#1 lore raw
Quoted 8 lines · 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.

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

Quoted 49 lines
---
 drivers/gpu/drm/amd/amdgpu/nv.c    | 2 --
 drivers/gpu/drm/amd/amdgpu/soc15.c | 4 ----
 2 files changed, 6 deletions(-)
drivers/gpu/drm/amd/amdgpu/nv.c +0 -2
index 9253c03d387a..10ec0e81ee58 100644
@@ -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, &dm_ip_block);
-#else
-#      warning "Enable CONFIG_DRM_AMD_DC for display support on navi."
 #endif
                amdgpu_device_ip_block_add(adev, &gfx_v10_0_ip_block);
                amdgpu_device_ip_block_add(adev, &sdma_v5_0_ip_block);
drivers/gpu/drm/amd/amdgpu/soc15.c +0 -5
index 87152d8ef0df..90fb0149fbea 100644
@@ -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, &dm_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, &uvd_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, &dm_ip_block);
-#else
-#      warning "Enable CONFIG_DRM_AMD_DC for display support on SOC15."
 #endif
                amdgpu_device_ip_block_add(adev, &vcn_v1_0_ip_block);
                break;
--

2.20.0

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#2 lore raw
Quoted 6 lines · Alex Deucher
Quoted 4 lines · Arnd Bergmann

It is annoying to have #warnings that trigger in randconfig builds like

Quoted 7 lines
Quoted 4 lines

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:

(quoted diff) +0 -0

b/drivers/gpu/drm/amd/display/Kconfig
index 2cfbbf3b85dd..9862a193349a 100644

drivers/gpu/drm/amd/display/Kconfig +1 -1
@@ -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

Applied
#3 lore raw
In reply to Arnd Bergmann
Quoted 10 lines · 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.

Applied. thanks!

Alex

Quoted 43 lines
---
 drivers/gpu/drm/amd/amdgpu/nv.c    | 2 --
 drivers/gpu/drm/amd/amdgpu/soc15.c | 4 ----
 2 files changed, 6 deletions(-)
drivers/gpu/drm/amd/amdgpu/nv.c +0 -2
index 9253c03d387a..10ec0e81ee58 100644
@@ -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, &dm_ip_block);
-#else
-#      warning "Enable CONFIG_DRM_AMD_DC for display support on navi."
 #endif
                amdgpu_device_ip_block_add(adev, &gfx_v10_0_ip_block);
                amdgpu_device_ip_block_add(adev, &sdma_v5_0_ip_block);
drivers/gpu/drm/amd/amdgpu/soc15.c +0 -5
index 87152d8ef0df..90fb0149fbea 100644
@@ -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, &dm_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, &uvd_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, &dm_ip_block);
-#else
-#      warning "Enable CONFIG_DRM_AMD_DC for display support on SOC15."
 #endif
                amdgpu_device_ip_block_add(adev, &vcn_v1_0_ip_block);
                break;
--

2.20.0

Quoted 4 lines

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel