From mboxrd@z Thu Jan 1 00:00:00 1970 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 BBC1FC4332F for ; Tue, 1 Nov 2022 16:35:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=03JY+koM3D8yE725DlthVB+4JAJw+RGMH3nxcu1FqDY=; b=4DPsCd6GYu45II CDWEj4tgBdWtRIwgm7W/4hAShmzgseBo0RcrucBm0QxelHk5XIXJsZcYm3RZ29JTBL5QVy/NW7awV p8yvnoQ5v/wYY54H1TxZeMNKgCFStCbwbRpB4TE1uD6qvimP5LxbQR61hBmrLTObuNnjgG3nPxIWB l9Ms/UxNoFGFyDlX1xU9iTXwID8svkdT+egLuLM2KoNm2beVjXl9V8mHkNKZw2GD3X64q9MJPRcA9 TXzM+SbuzTeeg2VeCaHFpSktgGIKJfrTW1RSLp1czNEzXJ+bu+sxfPq+hXiFRVH+75+GIepBNKSj4 9cERoMWhYDzulGdESApw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1opuDU-0061JX-Hu; Tue, 01 Nov 2022 16:34:20 +0000 Received: from casper.infradead.org ([90.155.50.34]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1opuB3-005zvk-HE for linux-arm-kernel@bombadil.infradead.org; Tue, 01 Nov 2022 16:31:49 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=In-Reply-To:Content-Type:MIME-Version: References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=NJsfSy1MbO3Cg0wygcbGHbY/n4S7FwFx5EXxpJ9L7UI=; b=aeAE88A6EjZPh3y1oEODf5k22n HgkNvVfavbC0X9LcZH3uJ0TOzjKdN9GZxb8z8mEQyw6KvIZXk0EzLHHyrjT7SvynMnQ88uDfAxis+ a3nytD4lRGf30LKkpn4HKAm40B8nwbUCOtlKgdKRiWCjqHT0KBBlG/ATXRo9oG4048JokcgMpHy55 k4YkyRVmEczDtB03XdedVNXAyeSvlyi3n/DRIpFPgzPLtGwXD06nNmMcdd7CJTlL3RV6Rq6S2s/oZ +fGDR8B93156QBYKphiE/Nq92F7OAuICrU4KjTng1OD+CjSr3cFZ/Oi2r8clj60K0QZk+k3A2wF5V 8Ps8Wq6Q==; Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by casper.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1opuB4-004ksQ-3r for linux-arm-kernel@lists.infradead.org; Tue, 01 Nov 2022 16:31:52 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id D3F05616A1; Tue, 1 Nov 2022 16:31:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0FD84C433D6; Tue, 1 Nov 2022 16:31:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1667320297; bh=beFa7xg5aKgKvDxmomMDzpM1jKDB1WUzp4AeIHwRHDg=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=CSBeW+R6nBe/LlhwWE/3Q0Ij9d8HFwpxSqDuJqRFIfFkpmwCcbA4KHmW9OOiJmHYZ lmdH8zE+ByZjcrvkT9vXZbTyPu39TFsnsCOm+t2dyq8n37TLE7yc7g2+mifetL8Zbv E4gS1qDGvGaAPhzoYYsNaI4U7KPfRTugilCRGf0y8bm2A2gUWN5vTNguTXrFlPBKFY Y9w47XB3kdfFcS1M1WjwncQY1Z53diLniwb/D8MfZExZ4LiGAA2fOLLkSHMXKvcydN 4O0YHlNZSVtNNlQcsUEWSFq+4JucS+WBssNBflaYOevY7s19smEU4XaryP2BtTxy+S RfQO+fYywLTbA== Date: Tue, 1 Nov 2022 09:31:35 -0700 From: Nathan Chancellor To: Rodrigo Siqueira Jordao Cc: Ao Zhong , amd-gfx@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, Harry Wentland , Leo Li , Arnd Bergmann , Alex Deucher , Stephen Rothwell , Christian =?iso-8859-1?Q?K=F6nig?= Subject: Re: [PATCH v4 1/1] drm/amd/display: add DCN support for ARM64 Message-ID: References: <20221031193738.23538-1-hacc1225@gmail.com> <20221031193738.23538-2-hacc1225@gmail.com> <6b5fb93f-fd23-c96d-0f1d-ba8bcd7a5079@amd.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <6b5fb93f-fd23-c96d-0f1d-ba8bcd7a5079@amd.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221101_163150_429934_034E768A X-CRM114-Status: GOOD ( 22.66 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Tue, Nov 01, 2022 at 10:36:08AM -0400, Rodrigo Siqueira Jordao wrote: > > > On 2022-10-31 15:37, Ao Zhong wrote: > > After moving all FPU code to the DML folder, we can enable DCN support > > for the ARM64 platform. Remove the -mgeneral-regs-only CFLAG from the > > code in the DML folder that needs to use hardware FPU, and add a control > > mechanism for ARM Neon. > > > > Signed-off-by: Ao Zhong > > --- > > drivers/gpu/drm/amd/display/Kconfig | 3 ++- > > .../gpu/drm/amd/display/amdgpu_dm/dc_fpu.c | 6 ++++++ > > drivers/gpu/drm/amd/display/dc/dml/Makefile | 20 +++++++++++++++---- > > 3 files changed, 24 insertions(+), 5 deletions(-) > > > > diff --git a/drivers/gpu/drm/amd/display/Kconfig b/drivers/gpu/drm/amd/display/Kconfig > > index 0142affcdaa3..843a55a6a3ac 100644 > > --- a/drivers/gpu/drm/amd/display/Kconfig > > +++ b/drivers/gpu/drm/amd/display/Kconfig > > @@ -6,7 +6,8 @@ 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) > > + # !CC_IS_CLANG: https://github.com/ClangBuiltLinux/linux/issues/1752 > > + select DRM_AMD_DC_DCN if (X86 || PPC64 || (ARM64 && KERNEL_MODE_NEON && !CC_IS_CLANG)) > > 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/amdgpu_dm/dc_fpu.c b/drivers/gpu/drm/amd/display/amdgpu_dm/dc_fpu.c > > index ab0c6d191038..1743ca0a3641 100644 > > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/dc_fpu.c > > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/dc_fpu.c > > @@ -31,6 +31,8 @@ > > #elif defined(CONFIG_PPC64) > > #include > > #include > > +#elif defined(CONFIG_ARM64) > > +#include > > #endif > > /** > > @@ -99,6 +101,8 @@ void dc_fpu_begin(const char *function_name, const int line) > > preempt_disable(); > > enable_kernel_fp(); > > } > > +#elif defined(CONFIG_ARM64) > > + kernel_neon_begin(); > > #endif > > } > > @@ -136,6 +140,8 @@ void dc_fpu_end(const char *function_name, const int line) > > disable_kernel_fp(); > > preempt_enable(); > > } > > +#elif defined(CONFIG_ARM64) > > + kernel_neon_end(); > > #endif > > } > > diff --git a/drivers/gpu/drm/amd/display/dc/dml/Makefile b/drivers/gpu/drm/amd/display/dc/dml/Makefile > > index d0c6cf61c676..d4e93bed1c8e 100644 > > --- a/drivers/gpu/drm/amd/display/dc/dml/Makefile > > +++ b/drivers/gpu/drm/amd/display/dc/dml/Makefile > > @@ -33,6 +33,10 @@ ifdef CONFIG_PPC64 > > dml_ccflags := -mhard-float -maltivec > > endif > > +ifdef CONFIG_ARM64 > > +dml_rcflags := -mgeneral-regs-only > > +endif > > + > > ifdef CONFIG_CC_IS_GCC > > ifeq ($(call cc-ifversion, -lt, 0701, y), y) > > IS_OLD_GCC = 1 > > @@ -55,8 +59,6 @@ frame_warn_flag := -Wframe-larger-than=2048 > > endif > > CFLAGS_$(AMDDALPATH)/dc/dml/display_mode_lib.o := $(dml_ccflags) > > - > > -ifdef CONFIG_DRM_AMD_DC_DCN > > CFLAGS_$(AMDDALPATH)/dc/dml/display_mode_vba.o := $(dml_ccflags) > > CFLAGS_$(AMDDALPATH)/dc/dml/dcn10/dcn10_fpu.o := $(dml_ccflags) > > CFLAGS_$(AMDDALPATH)/dc/dml/dcn20/dcn20_fpu.o := $(dml_ccflags) > > @@ -88,7 +90,6 @@ CFLAGS_$(AMDDALPATH)/dc/dml/calcs/dcn_calcs.o := $(dml_ccflags) > > CFLAGS_$(AMDDALPATH)/dc/dml/calcs/dcn_calc_auto.o := $(dml_ccflags) > > CFLAGS_$(AMDDALPATH)/dc/dml/calcs/dcn_calc_math.o := $(dml_ccflags) -Wno-tautological-compare > > CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/display_mode_vba.o := $(dml_rcflags) > > -CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn2x/dcn2x.o := $(dml_rcflags) > > CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn20/display_mode_vba_20.o := $(dml_rcflags) > > CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn20/display_rq_dlg_calc_20.o := $(dml_rcflags) > > CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn20/display_mode_vba_20v2.o := $(dml_rcflags) > > @@ -105,7 +106,18 @@ CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn32/display_mode_vba_util_32.o := $(dml_rcf > > CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn301/dcn301_fpu.o := $(dml_rcflags) > > CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/display_mode_lib.o := $(dml_rcflags) > > CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dsc/rc_calc_fpu.o := $(dml_rcflags) > > -endif > > +CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn10/dcn10_fpu.o := $(dml_rcflags) > > +CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn20/dcn20_fpu.o := $(dml_rcflags) > > +CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn314/display_mode_vba_314.o := $(dml_rcflags) > > +CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn314/display_rq_dlg_calc_314.o := $(dml_rcflags) > > +CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn314/dcn314_fpu.o := $(dml_rcflags) > > +CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn30/dcn30_fpu.o := $(dml_rcflags) > > +CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn32/dcn32_fpu.o := $(dml_rcflags) > > +CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn321/dcn321_fpu.o := $(dml_rcflags) > > +CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn31/dcn31_fpu.o := $(dml_rcflags) > > +CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn302/dcn302_fpu.o := $(dml_rcflags) > > +CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn303/dcn303_fpu.o := $(dml_rcflags) > > +CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/calcs/dcn_calc_math.o := $(dml_rcflags) > > CFLAGS_$(AMDDALPATH)/dc/dml/dml1_display_rq_dlg_calc.o := $(dml_ccflags) > > CFLAGS_$(AMDDALPATH)/dc/dml/display_rq_dlg_helpers.o := $(dml_ccflags) > > CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dml1_display_rq_dlg_calc.o := $(dml_rcflags) > > lgtm, > > Reviewed-by: Rodrigo Siqueira > > Nathan, > > If it is ok for you, I can merge this change. Yes, this version looks good to me, as the code can no longer be built for arm64 when using clang. Cheers, Nathan _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel