From: <sunpeng.li@amd.com>
To: <alexander.deucher@amd.com>, <christian.koenig@amd.com>,
<arnd@arndb.de>, <michel.daenzer@amd.com>
Cc: <linux-kernel@vger.kernel.org>, <amd-gfx@lists.freedesktop.org>,
<airlied@linux.ie>, <Jordan.Lazare@amd.com>,
<harry.wentland@amd.com>, "Leo (Sunpeng) Li" <sunpeng.li@amd.com>
Subject: [PATCH 2/2] drm/amd/display: Don't build DCN1 when kcov is enabled
Date: Thu, 16 Aug 2018 15:44:39 -0400 [thread overview]
Message-ID: <1534448679-13823-2-git-send-email-sunpeng.li@amd.com> (raw)
In-Reply-To: <1534448679-13823-1-git-send-email-sunpeng.li@amd.com>
From: "Leo (Sunpeng) Li" <sunpeng.li@amd.com>
DCN1 contains code that utilizes fp math. When
CONFIG_KCOV_INSTRUMENT_ALL and CONFIG_KCOV_ENABLE_COMPARISONS are
enabled, build errors are found. See this earlier patch for details:
https://lists.freedesktop.org/archives/dri-devel/2018-August/186131.html
As a short term solution, disable CONFIG_DRM_AMD_DC_DCN1_0 when
KCOV_INSTRUMENT_ALL and KCOV_ENABLE_COMPARISONS are enabled. In
addition, make it a fully derived config, taking into account
CONFIG_X86.
Signed-off-by: Leo (Sunpeng) Li <sunpeng.li@amd.com>
---
drivers/gpu/drm/amd/display/Kconfig | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/Kconfig b/drivers/gpu/drm/amd/display/Kconfig
index 4c35625..ed654a7 100644
--- a/drivers/gpu/drm/amd/display/Kconfig
+++ b/drivers/gpu/drm/amd/display/Kconfig
@@ -4,18 +4,16 @@ menu "Display Engine Configuration"
config DRM_AMD_DC
bool "AMD DC - Enable new display engine"
default y
+ select DRM_AMD_DC_DCN1_0 if X86 && !(KCOV_INSTRUMENT_ALL && KCOV_ENABLE_COMPARISONS)
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
- default y
+ def_bool n
help
- Choose this option if you want to have
- RV family for display engine
+ RV family support for display engine
config DEBUG_KERNEL_DC
bool "Enable kgdb break in DC"
--
2.7.4
next prev parent reply other threads:[~2018-08-16 19:45 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-16 19:44 [PATCH 1/2] Revert "drm/amdgpu/display: Replace CONFIG_DRM_AMD_DC_DCN1_0 with CONFIG_X86" sunpeng.li
2018-08-16 19:44 ` sunpeng.li [this message]
2018-08-16 21:05 ` [PATCH 2/2] drm/amd/display: Don't build DCN1 when kcov is enabled Arnd Bergmann
2018-08-17 7:25 ` Michel Dänzer
2018-08-16 21:29 ` [PATCH 1/2] Revert "drm/amdgpu/display: Replace CONFIG_DRM_AMD_DC_DCN1_0 with CONFIG_X86" Alex Deucher
2018-08-17 7:16 ` Christian König
2018-08-17 13:56 ` Leo Li
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1534448679-13823-2-git-send-email-sunpeng.li@amd.com \
--to=sunpeng.li@amd.com \
--cc=Jordan.Lazare@amd.com \
--cc=airlied@linux.ie \
--cc=alexander.deucher@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=arnd@arndb.de \
--cc=christian.koenig@amd.com \
--cc=harry.wentland@amd.com \
--cc=linux-kernel@vger.kernel.org \
--cc=michel.daenzer@amd.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).