Received: by 2002:ad5:4acb:0:0:0:0:0 with SMTP id n11csp1154273imw; Wed, 13 Jul 2022 14:49:32 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uQ1C9DlZmmp7az6yQgloFe5au9n6SUAP1Llgd2mXY0d3Ik5fvVGp07yv9v2iSzPMBaQDlc X-Received: by 2002:aa7:d64b:0:b0:43b:1f5d:1443 with SMTP id v11-20020aa7d64b000000b0043b1f5d1443mr935456edr.370.1657748972551; Wed, 13 Jul 2022 14:49:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657748972; cv=none; d=google.com; s=arc-20160816; b=xuo0nyaoPe7gIy/Rfvk+iDwGhO0ckCq7h92yzf0VeOXEw9q1HFdMZc/gf2eb0Kv3Vc 1mUQ1HIxR5k/4M9F7KRsVnwjm2ENOJCe7JHj1VxtfcQI3L2hvny4OgiuY8Gcq6SnPMf8 Tt8wxi8xNyhe+/Tiu1XQPfIgv5U+vIczFXSIPWKCm1lWvnr25VqmD0f33P07bz1uE4fI tLX9WcJeJUWxdfKi1ZDtVH7WBzIhWIVVtZqrsR4WFEzzlTzyFJL5ouNhPH7w8fKiDUCC 5vAkpWvQYwu20pcXLsOj0Ikb6r3C+Dk7U9ERuQOd+b4iwKBfxQyJi/dZP5F3cFLVuUA7 8M1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:subject:message-id:date:from:in-reply-to :references:mime-version:dkim-signature; bh=HZ0I7rnRXF+zKo0Waz+59mR5IWLr5zhMjzNRsbDc0Ws=; b=VF8elccErb3gV1FDJ6BL+7e4XwS9xMZ9emZx8Pv6P/wrI07kGfjA5vXZWj64Y4wDW5 CmtUseGnQ41eabU0hkgLNrUw4/dO0R50XmZvKfzFGtSrSpRhoqFW4KAuhyBgmQvNVQLz 35qzOuMcz1tESuTNl6sJz3HmRp879JNqGi8P9zuAOFQGWqlA5PK9QZYPTB3coBCegN6Z 6MGcG82Ac8HXIo5Rf2XybvCYQGP+oqFIk5Iuj5OPr6j5Uv4qfIq2u20vRmJ2J9unRK8Z tlSOANGJynoP8wqBzIC6ZlfOQQORNhCaTrXXPCOydTTgTrt5MPZz0TmNHVdC+6UgkGsm jJpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=kbNLt4GG; 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; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id nd42-20020a17090762aa00b0072b88003b1esi6484699ejc.630.2022.07.13.14.49.07; Wed, 13 Jul 2022 14:49:32 -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=kbNLt4GG; 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; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237020AbiGMU5Y (ORCPT + 99 others); Wed, 13 Jul 2022 16:57:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51652 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231815AbiGMU5W (ORCPT ); Wed, 13 Jul 2022 16:57:22 -0400 Received: from mail-ej1-x631.google.com (mail-ej1-x631.google.com [IPv6:2a00:1450:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 54505CD9 for ; Wed, 13 Jul 2022 13:57:21 -0700 (PDT) Received: by mail-ej1-x631.google.com with SMTP id os14so21999405ejb.4 for ; Wed, 13 Jul 2022 13:57:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=HZ0I7rnRXF+zKo0Waz+59mR5IWLr5zhMjzNRsbDc0Ws=; b=kbNLt4GGJ0sc1EmhUvJ/nBDhM7MzpppeLTEiVqt1Mi8RStPTVFb7yar8xhsEm7N2ar 16n8lgc0/OFEDLkstvqYUHdsacAqFDKMt1lpHbs3SELgH70FmMmtn3h1aiAkU2nxkkGz MlQ3zM2K+C2761yoiOt/pxnaT9Ii7THH8RKQNczpF4KXcD4inezFwm97AfLCS1GYixEv dxLcv86wRnYaQYaunEL+C/boLRFZsYDrC1snpyCW6uVJH+Yb/4f4mcMiJ7Vl3rY0J/3c znK1kKRdiQ0tYR3oqMShaiL4zx2Qzp9vbRhHMi2kQ3KUm/+0ExteICtQrCghfPX8G5V4 zFZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=HZ0I7rnRXF+zKo0Waz+59mR5IWLr5zhMjzNRsbDc0Ws=; b=1rJCzPfnyQgIahuwxPT97lXRwYi9kFRyrZpG50rPABbYNLtz+vh2dWLQUIj6LIAUw3 +7UMKXbYjgB7LGhmr5j6foGgi24Ic2u1kUQHMhPbtnDTDduO4Yk6dqIxkMITq11p+ZDq onEyITnpzN9mBxrocJrepiyGwgk0407j9Ot1DL3gp+2VuZgM90NiTg1TgS5ojuTxkK7M PU3pTOVGUvvaohxO+IEer2ZCdBNvHSAqJd5nvfzhzo/ZUqStbcVYAWJqZ8aHJ0XiLiLI zf7V4r45Wmie3yXcwy92cq7QFRQG4E1FGt0Ot2Q1JGfKolF+wLpj/0k2iNVr+T95jqdX dFlA== X-Gm-Message-State: AJIora+dhC/oJotFPGLNSx+T+Laf5pa7ecLoQ7AJPCceT2wCuFEU13NC mKmz2tW5Pqg3vgVyv62b63WCGTfdrKc1EkZiR5c= X-Received: by 2002:a17:907:2702:b0:72b:307b:98e6 with SMTP id w2-20020a170907270200b0072b307b98e6mr5315152ejk.658.1657745839832; Wed, 13 Jul 2022 13:57:19 -0700 (PDT) MIME-Version: 1.0 References: <20220618232737.2036722-1-linux@roeck-us.net> <584fc348-7a60-26a2-af61-9edc4f4830e4@amd.com> In-Reply-To: <584fc348-7a60-26a2-af61-9edc4f4830e4@amd.com> From: Alex Deucher Date: Wed, 13 Jul 2022 16:57:07 -0400 Message-ID: Subject: Re: [PATCH] drm/amd/display: Add missing hard-float compile flags for PPC64 builds To: Rodrigo Siqueira Jordao Cc: Guenter Roeck , Harry Wentland , Leo Li , Michael Ellerman , LKML , amd-gfx list , David Airlie , Maling list - DRI developers , Alex Deucher , =?UTF-8?Q?Christian_K=C3=B6nig?= , Daniel Axtens Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham 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 5:01 PM 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 I don't understand why we don't need to add the hard-float flags back on the other DCN blocks. Did we miss something in the DML cleanup for DCN 3.1.x? Anyway, at this point, the patch is: Acked-by: Alex Deucher We can sort the rest out for 5.20. Alex > folder. Notice that we have the PPC64 in the DML Makefile: > > https://gitlab.freedesktop.org/agd5f/linux/-/blob/amd-staging-drm-next/drivers/gpu/drm/amd/display/dc/dml/Makefile > > Could you share what you see without your patch in the > amd-staging-drm-next? Also: > * Are you using cross-compilation? If so, could you share your setup? > * Which GCC/Clang version are you using? > > Thanks > Siqueira >