Received: by 2002:a6b:fb09:0:0:0:0:0 with SMTP id h9csp1141323iog; Thu, 30 Jun 2022 18:23:18 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vrIVkbHTE5HZKNpM8KRWpHfsd8+pygi+lyrOrmvIlU/NlRf5W2Gm7TB8HYH3lrpDkibEMQ X-Received: by 2002:a05:6402:3690:b0:437:ba81:e218 with SMTP id ej16-20020a056402369000b00437ba81e218mr15714168edb.26.1656638598507; Thu, 30 Jun 2022 18:23:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656638598; cv=none; d=google.com; s=arc-20160816; b=a6HBVYbAyYwLTaecDgZ8j+7CuOo4lRaLkFoQ1qF63Q6uAran2uTMh6XCUrtuNayPdy RKxDlmuUrg7uwnOALtLZ6EjZEFUsoe92VpVjQjvSRu1GpOpMOgi09GzaJJQfN6Ka3SN1 G0K26/2OwGbpawapXeYzCShMnt6smoXPGu9FUFLF3bn7AT+VSNe2PhRaZCDPVvRSVY+h E25LZ96RdbL7ByPDaQDYTWk5I+W2ebEP6LBGQXr4rShj173MS+3tq/6gwnvUeEmHTbX+ moCuhzxBqxOI0OOTe50yrXI2RbjyCnEjO05sbg9PlAlcgTdtrqwcrhls5KsNBakUoib/ UEfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:sender:dkim-signature; bh=V0zM+5bGzrkuoT/FKu7bEUEOWBFCnfKhcSbWomk53qM=; b=OEXQmqEfNvAIOTH0TDDPwB4aXWlxwWuyifWp7QUc4cHBWBBngzjUzSQVah9N7S7AtJ K9FF4mEnUwff/Y1G68RlvkJci0Dt3M4WLFvPX3Y1/akVUVKMYwi+pBl0WCRrPDsvdgTA MJ9UOGLwk4Z0BhRqsBGgt+FeABeajHSsw9/BTg5mPrO/UQfEgOBWrxivTqUwgJ39jqzb Z575OuUTnu/kU2eqDMbZnwaO1idpdXlI7pSlnNU1eySwLF4G0AtFxF45IHP625j3IAMC guYQ1yBKE9yDSWwfMeRFbWqhdpxFZywPn5OvZoexn1V5RqY8zPwHBheeDL2UMw9PAmA5 LY0w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b="admCY/5S"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id du18-20020a17090772d200b007267d5bec8csi413466ejc.994.2022.06.30.18.22.51; Thu, 30 Jun 2022 18:23:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b="admCY/5S"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232447AbiGABAt (ORCPT + 99 others); Thu, 30 Jun 2022 21:00:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54266 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231918AbiGABAr (ORCPT ); Thu, 30 Jun 2022 21:00:47 -0400 Received: from mail-pj1-x1035.google.com (mail-pj1-x1035.google.com [IPv6:2607:f8b0:4864:20::1035]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5125C599D6 for ; Thu, 30 Jun 2022 18:00:46 -0700 (PDT) Received: by mail-pj1-x1035.google.com with SMTP id go6so1156803pjb.0 for ; Thu, 30 Jun 2022 18:00:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=V0zM+5bGzrkuoT/FKu7bEUEOWBFCnfKhcSbWomk53qM=; b=admCY/5SeVAW7JF20wM5exEz/XP8A8JZMf56qXi/BvZ/2TzamG0oewPdsY/dof8rZt QtBTb80R8GTBeghWwTMNXB1kZ/9L4C/U3ie+lv4Nmc730oSOBoFsLTgET87olma0YXDl bgUJ5ybAaruQbmdtzc9cfmvtAZKXR3LCKVBpbZe+F3gmflagoSjDTC1FmEZg6Iicm2IP 6t9iUJCBMnEL9qPZ2Ke3p0wLZTdFHwYfgbfN0BX/e7mdw2V9E7VTPYOTSZRlD6O8+fpq m0se6R/bavZys/jzlg+i246xcW99nqDeM+NeqVrqekQpJ4kRwff9J8W/s5IYeiGXKyFS F7Dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :references:mime-version:content-disposition:in-reply-to; bh=V0zM+5bGzrkuoT/FKu7bEUEOWBFCnfKhcSbWomk53qM=; b=IduoI5Q4KfwufCA97uAUK0Cds+m3GJy6vYjdkaG86C/au6FiEmPnSYH2LypWg3BDZD ++16mbdOeMuZGbHmeZt08mgrwhsrL7bKJOjSqtF0ThLAQ66zD6y4bSA+vllHbQ5NuBWx HlG6Z2K3ly5OViOByUGqTgc8g1lY0HVdHbMtDcbg9f6TAYGTd4xwL4Ebi78BGuBtCXDo v9jcXDrOR+68VR1L7ikPIyHPaf4YeR8tnSV3WGXPUpUXtt5Af87tOL6sv6Q0v5obJSj1 khOrj/H13BwBjFBDl37dadS1zQFwTOuD3t9I3iPaQfoTXZt29QajemGUNYofyHauJBn+ OlNA== X-Gm-Message-State: AJIora+HW1XqF8M1OE/eMRRlSYfEq2EmPlPAlnFAiGDrHBPOfC5ERQyo 9bNpPM9XdZc8xgl96EdPH0U= X-Received: by 2002:a17:902:d1cd:b0:169:f061:7341 with SMTP id g13-20020a170902d1cd00b00169f0617341mr18532874plb.16.1656637245831; Thu, 30 Jun 2022 18:00:45 -0700 (PDT) Received: from server.roeck-us.net ([2600:1700:e321:62f0:329c:23ff:fee3:9d7c]) by smtp.gmail.com with ESMTPSA id w20-20020a1709029a9400b0015e8d4eb231sm14131141plp.123.2022.06.30.18.00.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Jun 2022 18:00:43 -0700 (PDT) Sender: Guenter Roeck Date: Thu, 30 Jun 2022 18:00:42 -0700 From: Guenter Roeck To: Rodrigo Siqueira Jordao Cc: Harry Wentland , Leo Li , Alex Deucher , Christian =?iso-8859-1?Q?K=F6nig?= , David Airlie , Daniel Vetter , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Michael Ellerman , Daniel Axtens Subject: Re: [PATCH] drm/amd/display: Add missing hard-float compile flags for PPC64 builds Message-ID: <20220701010042.GH3104033@roeck-us.net> References: <20220618232737.2036722-1-linux@roeck-us.net> <584fc348-7a60-26a2-af61-9edc4f4830e4@amd.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <584fc348-7a60-26a2-af61-9edc4f4830e4@amd.com> X-Spam-Status: No, score=-1.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Jun 30, 2022 at 05:01:01PM -0400, Rodrigo Siqueira Jordao wrote: > > > On 2022-06-18 19:27, Guenter Roeck wrote: > > ppc:allmodconfig builds fail with the following error. > > > > powerpc64-linux-ld: > > drivers/gpu/drm/amd/amdgpu/../display/dc/dml/display_mode_lib.o > > uses hard float, > > drivers/gpu/drm/amd/amdgpu/../display/dc/dcn31/dcn31_resource.o > > uses soft float > > powerpc64-linux-ld: > > failed to merge target specific data of file > > drivers/gpu/drm/amd/amdgpu/../display/dc/dcn31/dcn31_resource.o > > powerpc64-linux-ld: > > drivers/gpu/drm/amd/amdgpu/../display/dc/dml/display_mode_lib.o > > uses hard float, > > drivers/gpu/drm/amd/amdgpu/../display/dc/dcn315/dcn315_resource.o > > uses soft float > > powerpc64-linux-ld: > > failed to merge target specific data of > > file drivers/gpu/drm/amd/amdgpu/../display/dc/dcn315/dcn315_resource.o > > powerpc64-linux-ld: > > drivers/gpu/drm/amd/amdgpu/../display/dc/dml/display_mode_lib.o > > uses hard float, > > drivers/gpu/drm/amd/amdgpu/../display/dc/dcn316/dcn316_resource.o > > uses soft float > > powerpc64-linux-ld: > > failed to merge target specific data of file > > drivers/gpu/drm/amd/amdgpu/../display/dc/dcn316/dcn316_resource.o > > > > The problem was introduced with commit 41b7a347bf14 ("powerpc: Book3S > > 64-bit outline-only KASAN support") which adds support for KASAN. This > > commit in turn enables DRM_AMD_DC_DCN because KCOV_INSTRUMENT_ALL and > > KCOV_ENABLE_COMPARISONS are no longer enabled. As result, new files are > > compiled which lack the selection of hard-float. > > > > Fixes: 41b7a347bf14 ("powerpc: Book3S 64-bit outline-only KASAN support") > > Cc: Michael Ellerman > > Cc: Daniel Axtens > > Signed-off-by: Guenter Roeck > > --- > > drivers/gpu/drm/amd/display/dc/dcn31/Makefile | 4 ++++ > > drivers/gpu/drm/amd/display/dc/dcn315/Makefile | 4 ++++ > > drivers/gpu/drm/amd/display/dc/dcn316/Makefile | 4 ++++ > > 3 files changed, 12 insertions(+) > > > > diff --git a/drivers/gpu/drm/amd/display/dc/dcn31/Makefile b/drivers/gpu/drm/amd/display/dc/dcn31/Makefile > > index ec041e3cda30..74be02114ae4 100644 > > --- a/drivers/gpu/drm/amd/display/dc/dcn31/Makefile > > +++ b/drivers/gpu/drm/amd/display/dc/dcn31/Makefile > > @@ -15,6 +15,10 @@ DCN31 = dcn31_resource.o dcn31_hubbub.o dcn31_hwseq.o dcn31_init.o dcn31_hubp.o > > dcn31_apg.o dcn31_hpo_dp_stream_encoder.o dcn31_hpo_dp_link_encoder.o \ > > dcn31_afmt.o dcn31_vpg.o > > +ifdef CONFIG_PPC64 > > +CFLAGS_$(AMDDALPATH)/dc/dcn31/dcn31_resource.o := -mhard-float -maltivec > > +endif > > + > > AMD_DAL_DCN31 = $(addprefix $(AMDDALPATH)/dc/dcn31/,$(DCN31)) > > AMD_DISPLAY_FILES += $(AMD_DAL_DCN31) > > diff --git a/drivers/gpu/drm/amd/display/dc/dcn315/Makefile b/drivers/gpu/drm/amd/display/dc/dcn315/Makefile > > index 59381d24800b..1395c1ced8c5 100644 > > --- a/drivers/gpu/drm/amd/display/dc/dcn315/Makefile > > +++ b/drivers/gpu/drm/amd/display/dc/dcn315/Makefile > > @@ -25,6 +25,10 @@ > > DCN315 = dcn315_resource.o > > +ifdef CONFIG_PPC64 > > +CFLAGS_$(AMDDALPATH)/dc/dcn315/dcn315_resource.o := -mhard-float -maltivec > > +endif > > + > > AMD_DAL_DCN315 = $(addprefix $(AMDDALPATH)/dc/dcn315/,$(DCN315)) > > AMD_DISPLAY_FILES += $(AMD_DAL_DCN315) > > diff --git a/drivers/gpu/drm/amd/display/dc/dcn316/Makefile b/drivers/gpu/drm/amd/display/dc/dcn316/Makefile > > index 819d44a9439b..c3d2dd78f1e2 100644 > > --- a/drivers/gpu/drm/amd/display/dc/dcn316/Makefile > > +++ b/drivers/gpu/drm/amd/display/dc/dcn316/Makefile > > @@ -25,6 +25,10 @@ > > DCN316 = dcn316_resource.o > > +ifdef CONFIG_PPC64 > > +CFLAGS_$(AMDDALPATH)/dc/dcn316/dcn316_resource.o := -mhard-float -maltivec > > +endif > > + > > AMD_DAL_DCN316 = $(addprefix $(AMDDALPATH)/dc/dcn316/,$(DCN316)) > > AMD_DISPLAY_FILES += $(AMD_DAL_DCN316) > > Hi, > > I don't want to re-introduce those FPU flags for DCN31/DCN314/DCN316 since > we fully isolate FPU operations for those ASICs inside the DML folder. FWIW, I don't think that matters from a linking perspective since the hard-float and the soft-float objects are linked together, and the linker bails out on that because the ABIs are not compatible. You only get a warning on that unless you build with -Werror, which is the case for allmodconfig builds. Guenter