drm/amd/display: Enable building new display engine with KCOV enabled
Subsystems (3)
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.
--- 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
@@ -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
@@ -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
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 disablingCONFIG_DRM_AMD_DC_DCNifKCOV_INSTRUMENT_ALLandKCOV_ENABLE_COMPARISONSare 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]>Signed-off-by Guenter Roeck <[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@@ -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 anddrivers/gpu/drm/amd/display/dc/Makefile +3
-0@@ -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
Alex Deucher
AppliedApplied. 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 disablingCONFIG_DRM_AMD_DC_DCNifKCOV_INSTRUMENT_ALLandKCOV_ENABLE_COMPARISONSare 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]>Signed-off-by Guenter Roeck <[email protected]>Reviewed-by Harry Wentland <[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@@ -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 anddrivers/gpu/drm/amd/display/dc/Makefile +3
-0@@ -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
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 disablingCONFIG_DRM_AMD_DC_DCNifKCOV_INSTRUMENT_ALLandKCOV_ENABLE_COMPARISONSare 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]>Signed-off-by Guenter Roeck <[email protected]>Reviewed-by Harry Wentland <[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@@ -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 anddrivers/gpu/drm/amd/display/dc/Makefile +3
-0@@ -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