Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1DD8CC43334 for ; Thu, 14 Jul 2022 17:20:32 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2DD8810E2F1; Thu, 14 Jul 2022 17:20:32 +0000 (UTC) Received: from mail-pl1-x632.google.com (mail-pl1-x632.google.com [IPv6:2607:f8b0:4864:20::632]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4E12310E2F1; Thu, 14 Jul 2022 17:20:31 +0000 (UTC) Received: by mail-pl1-x632.google.com with SMTP id k19so993310pll.5; Thu, 14 Jul 2022 10:20:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=aiimYL4bGGP4Obd7S4r8NfKIKgNtZtb7QnLuS/XBbGM=; b=h10XwfkbRdiTDooUNnPb6LXyfdxthOG17pIb6QhROE2ENj8ZLnLAVIneYyMxI/Vsni EP/wwbppFhJ3tF5S76D99EqVhGqY0A/bWfRhEd2XlwEgssDD55cOxQwUCYYq+uaroqsM Zz4rJUqQ2p+mg3pNTdwZfINQEbnlDUFEm6ForSg8tpjYjf6PUcmZL4GTmioTO47bkLMc xNySOAengQHQGoQMYaJsDCOIUS0p/jR3kF/VLXz1D4WOuX8E3Smr6LzUWho5z+EhC8Vs NrTSZ5jbpnRCaUXYO6jbRRaQ+iZo8ee4VFo2jsMXpsNEB9x8eqhAvHDkcNBulO1ad0nJ gt4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:message-id:date:mime-version:user-agent :subject:content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=aiimYL4bGGP4Obd7S4r8NfKIKgNtZtb7QnLuS/XBbGM=; b=JENA8gDO3+lj4Dvq9aCIRErJjAsgRL8L7oS0uSVPy1rw62kQji3On0awEj4dJBoSc8 cthumbQPzreKF3hWEakhu6ZdYljpUtO+fndJ40JsszGw+KU1Ptc6VKf4ooFO4hKjzTSU RyFbPjI19bmnFp1QHso8kElCrOyuwc+mZ02BO8DIcTBdA5KFHmV+BbW0YiS5sAE1O8KO pEGvEhNaYseUliBviFmtog3He1iuOv0+0Kyc0fQEcpjEvOVTM27ZqqO6w4uY5XJVE2VE G/o2FMFM7jfgD1eCFYRa9/7f1tJ19tdNppXStb01b2X9ZIX/Y8ReYEeUAiyNrz6JU4Bh hFEw== X-Gm-Message-State: AJIora/PZWPy/n7+eqUhYhFrfOHlZOtzKDhAsAUplseXg7Gud6nGwV1i x/Vl+gIiYS8TxEfC/CZtpDk= X-Google-Smtp-Source: AGRyM1vM+4sA+x5IyNACx13FZKKy3VVeFA6buU+LX+i72+lqssb7wr0KfDVhzrwUHfklHa2xFydZTA== X-Received: by 2002:a17:903:234c:b0:16c:3dba:37fa with SMTP id c12-20020a170903234c00b0016c3dba37famr9325277plh.89.1657819230890; Thu, 14 Jul 2022 10:20:30 -0700 (PDT) Received: from ?IPV6:2600:1700:e321:62f0:329c:23ff:fee3:9d7c? ([2600:1700:e321:62f0:329c:23ff:fee3:9d7c]) by smtp.gmail.com with ESMTPSA id w125-20020a636283000000b00419b1671c54sm1672819pgb.4.2022.07.14.10.20.29 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 14 Jul 2022 10:20:29 -0700 (PDT) Message-ID: <00a2cb3c-e358-b8f1-5e65-bc1c0694f54d@roeck-us.net> Date: Thu, 14 Jul 2022 10:20:28 -0700 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.9.1 Subject: Re: [PATCH] drm/amd/display: Enable building new display engine with KCOV enabled Content-Language: en-US To: Alex Deucher , Harry Wentland References: <20220712224247.1950273-1-linux@roeck-us.net> <98b656f3-e506-90be-ebcc-898813051e74@amd.com> From: Guenter Roeck In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Arnd Bergmann , Leo Li , LKML , Maling list - DRI developers , amd-gfx list , Alex Deucher Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On 7/14/22 09:29, Alex Deucher wrote: > Applied. Thanks! > > On Wed, Jul 13, 2022 at 4:03 PM Harry Wentland wrote: >> >> On 2022-07-12 18:42, Guenter Roeck wrote: >>> 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 >>> 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 >>> Cc: Leo Li >>> Signed-off-by: Guenter Roeck >> >> Reviewed-by: Harry Wentland >> >> Harry >> >>> --- >>> drivers/gpu/drm/amd/display/Kconfig | 2 +- >>> drivers/gpu/drm/amd/display/dc/Makefile | 3 +++ >>> 2 files changed, 4 insertions(+), 1 deletion(-) >>> >>> diff --git a/drivers/gpu/drm/amd/display/Kconfig b/drivers/gpu/drm/amd/display/Kconfig >>> index b4029c0d5d8c..96cbc87f7b6b 100644 >>> --- a/drivers/gpu/drm/amd/display/Kconfig >>> +++ b/drivers/gpu/drm/amd/display/Kconfig >>> @@ -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 >>> diff --git a/drivers/gpu/drm/amd/display/dc/Makefile b/drivers/gpu/drm/amd/display/dc/Makefile >>> index b4eca0236435..b801973749d2 100644 >>> --- a/drivers/gpu/drm/amd/display/dc/Makefile >>> +++ b/drivers/gpu/drm/amd/display/dc/Makefile >>> @@ -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 >>