Skip to contentSkip to conversation

drm/amd/display: Enable building new display engine with KCOV enabled

PATCH Applied Guenter Roeck 3 participants 4 messages Jul 12, 2022 – Jul 14, 2022

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

PATCH 1/1 drm/amd/display: Enable building new display engine with KCOV enabled

The new display engine uses floating point math, which is not supported by KCOV. Commit 9d1d02ff3678 ("drm/amd/display: Don't build DCN1 when kcov is enabled") tried to work around the problem by disabling CONFIG_DRM_AMD_DC_DCN if KCOV_INSTRUMENT_ALL and KCOV_ENABLE_COMPARISONS are enabled. The result is that KCOV can not be enabled on systems which require this display engine. A much simpler and less invasive solution is to disable KCOV selectively when compiling the display enagine while keeping it enabled for the rest of the kernel.

Fixes 9d1d02ff3678 ("drm/amd/display: Don't build DCN1 when kcov is enabled")
Cc Arnd Bergmann <[email protected]>
Cc Leo Li <[email protected]>
---
 drivers/gpu/drm/amd/display/Kconfig     | 2 +-
 drivers/gpu/drm/amd/display/dc/Makefile | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/Kconfig +1 -1
index b4029c0d5d8c..96cbc87f7b6b 100644
@@ -6,7 +6,7 @@ config DRM_AMD_DC
 	bool "AMD DC - Enable new display engine"
 	default y
 	select SND_HDA_COMPONENT if SND_HDA_CORE
-	select DRM_AMD_DC_DCN if (X86 || PPC64) && !(KCOV_INSTRUMENT_ALL && KCOV_ENABLE_COMPARISONS)
+	select DRM_AMD_DC_DCN if (X86 || PPC64)
 	help
 	  Choose this option if you want to use the new display engine
 	  support for AMDGPU. This adds required support for Vega and
drivers/gpu/drm/amd/display/dc/Makefile +3 -0
index b4eca0236435..b801973749d2 100644
@@ -26,6 +26,9 @@
 DC_LIBS = basics bios dml clk_mgr dce gpio irq link virtual
 
 ifdef CONFIG_DRM_AMD_DC_DCN
+
+KCOV_INSTRUMENT := n
+
 DC_LIBS += dcn20
 DC_LIBS += dsc
 DC_LIBS += dcn10
Signature · 1 line
2.35.1
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 9 lines · Guenter Roeck

The new display engine uses floating point math, which is not supported by KCOV. Commit 9d1d02ff3678 ("drm/amd/display: Don't build DCN1 when kcov is enabled") tried to work around the problem by disabling CONFIG_DRM_AMD_DC_DCN if KCOV_INSTRUMENT_ALL and KCOV_ENABLE_COMPARISONS are enabled. The result is that KCOV can not be enabled on systems which require this display engine. A much simpler and less invasive solution is to disable KCOV selectively when compiling the display enagine while keeping it enabled for the rest of the kernel.

Quoted 4 lines
Fixes 9d1d02ff3678 ("drm/amd/display: Don't build DCN1 when kcov is enabled")
Cc Arnd Bergmann <[email protected]>
Cc Leo Li <[email protected]>

Harry

Quoted 32 lines
---
 drivers/gpu/drm/amd/display/Kconfig     | 2 +-
 drivers/gpu/drm/amd/display/dc/Makefile | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/Kconfig +1 -1
index b4029c0d5d8c..96cbc87f7b6b 100644
@@ -6,7 +6,7 @@ config DRM_AMD_DC
 	bool "AMD DC - Enable new display engine"
 	default y
 	select SND_HDA_COMPONENT if SND_HDA_CORE
-	select DRM_AMD_DC_DCN if (X86 || PPC64) && !(KCOV_INSTRUMENT_ALL && KCOV_ENABLE_COMPARISONS)
+	select DRM_AMD_DC_DCN if (X86 || PPC64)
 	help
 	  Choose this option if you want to use the new display engine
 	  support for AMDGPU. This adds required support for Vega and
drivers/gpu/drm/amd/display/dc/Makefile +3 -0
index b4eca0236435..b801973749d2 100644
@@ -26,6 +26,9 @@
 DC_LIBS = basics bios dml clk_mgr dce gpio irq link virtual
 
 ifdef CONFIG_DRM_AMD_DC_DCN
+
+KCOV_INSTRUMENT := n
+
 DC_LIBS += dcn20
 DC_LIBS += dsc
 DC_LIBS += dcn10
Applied
#2 lore raw

Applied. Thanks!

Quoted 53 lines · Harry Wentland
Quoted 9 lines · Guenter Roeck

The new display engine uses floating point math, which is not supported by KCOV. Commit 9d1d02ff3678 ("drm/amd/display: Don't build DCN1 when kcov is enabled") tried to work around the problem by disabling CONFIG_DRM_AMD_DC_DCN if KCOV_INSTRUMENT_ALL and KCOV_ENABLE_COMPARISONS are enabled. The result is that KCOV can not be enabled on systems which require this display engine. A much simpler and less invasive solution is to disable KCOV selectively when compiling the display enagine while keeping it enabled for the rest of the kernel.

Quoted 4 lines
Fixes 9d1d02ff3678 ("drm/amd/display: Don't build DCN1 when kcov is enabled")
Cc Arnd Bergmann <[email protected]>
Cc Leo Li <[email protected]>

Harry

Quoted 32 lines
---
 drivers/gpu/drm/amd/display/Kconfig     | 2 +-
 drivers/gpu/drm/amd/display/dc/Makefile | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/Kconfig +1 -1
index b4029c0d5d8c..96cbc87f7b6b 100644
@@ -6,7 +6,7 @@ config DRM_AMD_DC
      bool "AMD DC - Enable new display engine"
      default y
      select SND_HDA_COMPONENT if SND_HDA_CORE
-     select DRM_AMD_DC_DCN if (X86 || PPC64) && !(KCOV_INSTRUMENT_ALL && KCOV_ENABLE_COMPARISONS)
+     select DRM_AMD_DC_DCN if (X86 || PPC64)
      help
        Choose this option if you want to use the new display engine
        support for AMDGPU. This adds required support for Vega and
drivers/gpu/drm/amd/display/dc/Makefile +3 -0
index b4eca0236435..b801973749d2 100644
@@ -26,6 +26,9 @@
 DC_LIBS = basics bios dml clk_mgr dce gpio irq link virtual
 
 ifdef CONFIG_DRM_AMD_DC_DCN
+
+KCOV_INSTRUMENT := n
+
 DC_LIBS += dcn20
 DC_LIBS += dsc
 DC_LIBS += dcn10
#3 lore raw
Quoted 12 lines · Alex Deucher

Applied. Thanks!

Quoted 9 lines · Harry Wentland
Quoted 7 lines · Guenter Roeck

The new display engine uses floating point math, which is not supported by KCOV. Commit 9d1d02ff3678 ("drm/amd/display: Don't build DCN1 when kcov is enabled") tried to work around the problem by disabling CONFIG_DRM_AMD_DC_DCN if KCOV_INSTRUMENT_ALL and KCOV_ENABLE_COMPARISONS are enabled. The result is that KCOV can not be enabled on systems which require this display engine. A much simpler and less invasive solution is to disable KCOV selectively when compiling the display enagine while

"enagine". Outch.

Anyway, thanks for applying.

Guenter

Quoted 44 lines
Quoted 44 lines
Quoted 6 lines

keeping it enabled for the rest of the kernel.

Fixes 9d1d02ff3678 ("drm/amd/display: Don't build DCN1 when kcov is enabled")
Cc Arnd Bergmann <[email protected]>
Cc Leo Li <[email protected]>

Harry

Quoted 32 lines
---
  drivers/gpu/drm/amd/display/Kconfig     | 2 +-
  drivers/gpu/drm/amd/display/dc/Makefile | 3 +++
  2 files changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/Kconfig +1 -1
index b4029c0d5d8c..96cbc87f7b6b 100644
@@ -6,7 +6,7 @@ config DRM_AMD_DC
       bool "AMD DC - Enable new display engine"
       default y
       select SND_HDA_COMPONENT if SND_HDA_CORE
-     select DRM_AMD_DC_DCN if (X86 || PPC64) && !(KCOV_INSTRUMENT_ALL && KCOV_ENABLE_COMPARISONS)
+     select DRM_AMD_DC_DCN if (X86 || PPC64)
       help
         Choose this option if you want to use the new display engine
         support for AMDGPU. This adds required support for Vega and
drivers/gpu/drm/amd/display/dc/Makefile +3 -0
index b4eca0236435..b801973749d2 100644
@@ -26,6 +26,9 @@
  DC_LIBS = basics bios dml clk_mgr dce gpio irq link virtual
 
  ifdef CONFIG_DRM_AMD_DC_DCN
+
+KCOV_INSTRUMENT := n
+
  DC_LIBS += dcn20
  DC_LIBS += dsc
  DC_LIBS += dcn10